개정판 f87dfb18
Issue #200114 CTRL+방향키로 페이지의 Center 이동
- 뱡향키 사용시 컨트롤의 포커스가 변경되는 경우가 발생
CTRL+마우스 휠 페이지번호 변경
Change-Id: I7804b9fdf9a0720393a682a8183d9192ef43c8a3
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 905 | 905 |
|
| 906 | 906 |
private void zoomAndPanControl_MouseWheel(object sender, MouseWheelEventArgs e) |
| 907 | 907 |
{
|
| 908 |
if (e.MiddleButton == MouseButtonState.Pressed)
|
|
| 908 |
if (ViewerDataModel.Instance.IsPressCtrl)
|
|
| 909 | 909 |
{
|
| 910 |
if (e.Delta > 0) |
|
| 911 |
{
|
|
| 912 |
pageNavigator.GotoPage(Convert.ToInt32(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber) - 1); |
|
| 913 |
} |
|
| 914 |
else |
|
| 915 |
{
|
|
| 916 |
pageNavigator.GotoPage(Convert.ToInt32(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber) + 1); |
|
| 917 |
} |
|
| 910 | 918 |
|
| 911 | 919 |
} |
| 912 |
e.Handled = true; |
|
| 913 |
if (e.Delta > 0) |
|
| 914 |
{
|
|
| 915 |
Point currentContentMousePoint = e.GetPosition(zoomAndPanCanvas); |
|
| 916 |
ZoomIn(currentContentMousePoint); |
|
| 917 |
} |
|
| 918 | 920 |
else |
| 919 | 921 |
{
|
| 920 |
Point currentContentMousePoint = e.GetPosition(zoomAndPanCanvas); |
|
| 921 |
ZoomOut(currentContentMousePoint); |
|
| 922 |
e.Handled = true; |
|
| 923 |
if (e.Delta > 0) |
|
| 924 |
{
|
|
| 925 |
Point currentContentMousePoint = e.GetPosition(zoomAndPanCanvas); |
|
| 926 |
ZoomIn(currentContentMousePoint); |
|
| 927 |
} |
|
| 928 |
else |
|
| 929 |
{
|
|
| 930 |
Point currentContentMousePoint = e.GetPosition(zoomAndPanCanvas); |
|
| 931 |
ZoomOut(currentContentMousePoint); |
|
| 932 |
} |
|
| 922 | 933 |
} |
| 923 | 934 |
} |
| 924 | 935 |
|
| ... | ... | |
| 1269 | 1280 |
this._dragdropWindow.Top = w32Mouse.Y - (image.Height / 2); |
| 1270 | 1281 |
this._dragdropWindow.Show(); |
| 1271 | 1282 |
} |
| 1283 |
|
|
| 1284 |
|
|
| 1285 |
|
|
| 1272 | 1286 |
*/ |
| 1287 |
|
|
| 1288 |
public void MoveZoomAndPanControl(Vector dragOffset) |
|
| 1289 |
{
|
|
| 1290 |
|
|
| 1291 |
zoomAndPanControl.ContentOffsetX -= dragOffset.X; |
|
| 1292 |
zoomAndPanControl.ContentOffsetY -= dragOffset.Y; |
|
| 1293 |
|
|
| 1294 |
if (Sync.IsChecked) |
|
| 1295 |
{
|
|
| 1296 |
ViewerDataModel.Instance.Sync_ContentOffsetX = zoomAndPanControl.ContentOffsetX; |
|
| 1297 |
ViewerDataModel.Instance.Sync_ContentOffsetY = zoomAndPanControl.ContentOffsetY; |
|
| 1298 |
} |
|
| 1299 |
} |
|
| 1300 |
|
|
| 1273 | 1301 |
private void zoomAndPanControl_MouseMove(object sender, MouseEventArgs e) |
| 1274 | 1302 |
{
|
| 1275 | 1303 |
if (Common.ViewerDataModel.Instance.SelectedControl == "Batch") |
| ... | ... | |
| 1291 | 1319 |
Point currentCanvasZoomPanningMouseMovePoint = e.GetPosition(zoomAndPanCanvas); |
| 1292 | 1320 |
|
| 1293 | 1321 |
Vector dragOffset = currentCanvasZoomPanningMouseMovePoint - canvasZoommovingMouseDownPoint; |
| 1294 |
zoomAndPanControl.ContentOffsetX -= dragOffset.X; |
|
| 1295 |
zoomAndPanControl.ContentOffsetY -= dragOffset.Y; |
|
| 1296 | 1322 |
|
| 1297 |
if (Sync.IsChecked) |
|
| 1298 |
{
|
|
| 1299 |
ViewerDataModel.Instance.Sync_ContentOffsetX = zoomAndPanControl.ContentOffsetX; |
|
| 1300 |
ViewerDataModel.Instance.Sync_ContentOffsetY = zoomAndPanControl.ContentOffsetY; |
|
| 1301 |
} |
|
| 1323 |
MoveZoomAndPanControl(dragOffset); |
|
| 1302 | 1324 |
} |
| 1303 | 1325 |
|
| 1304 | 1326 |
if (mouseHandlingMode == MouseHandlingMode.Drawing && currentControl != null) |
내보내기 Unified diff
