개정판 902faaea
nuget 정리
Change-Id: I8fee2c9138a11bd4b441c0e29dd75d67ea2f63d9
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
1600 | 1600 |
private void CreateDragDropWindow2(ImageSource image) |
1601 | 1601 |
{ |
1602 | 1602 |
this._dragdropWindow = new Window(); |
1603 |
_dragdropWindow.Cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
1603 |
_dragdropWindow.Cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
1604 | 1604 |
_dragdropWindow.WindowStyle = WindowStyle.None; |
1605 | 1605 |
_dragdropWindow.AllowsTransparency = true; |
1606 | 1606 |
_dragdropWindow.AllowDrop = false; |
... | ... | |
1971 | 1971 |
else |
1972 | 1972 |
{ |
1973 | 1973 |
currentControl = null; |
1974 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
1974 |
this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
1975 | 1975 |
DialogMessage_Alert("Approved Stamp 가 등록되어 있지 않습니다. \n관리자에게 문의하세요.", "안내"); |
1976 | 1976 |
} |
1977 | 1977 |
} |
... | ... | |
2098 | 2098 |
} |
2099 | 2099 |
else |
2100 | 2100 |
{ |
2101 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
|
2102 |
SetCursor(); |
|
2101 |
if (this.Cursor != Cursors.None) |
|
2102 |
{ |
|
2103 |
this.cursor = new Cursor(App.DefaultArrowCursorStream); |
|
2104 |
SetCursor(); |
|
2105 |
} |
|
2103 | 2106 |
} |
2104 | 2107 |
} |
2105 | 2108 |
else |
... | ... | |
2140 | 2143 |
{ |
2141 | 2144 |
if (mouseHandlingMode == MouseHandlingMode.Drawing) |
2142 | 2145 |
{ |
2143 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
2146 |
this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
2144 | 2147 |
|
2145 | 2148 |
SetCursor(); |
2146 | 2149 |
|
... | ... | |
2229 | 2232 |
} |
2230 | 2233 |
else if (e.RightButton == MouseButtonState.Pressed) |
2231 | 2234 |
{ |
2232 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
2235 |
this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
2233 | 2236 |
SetCursor(); |
2234 | 2237 |
} |
2235 | 2238 |
|
... | ... | |
2239 | 2242 |
} |
2240 | 2243 |
else |
2241 | 2244 |
{ |
2242 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
2245 |
this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
2243 | 2246 |
SetCursor(); |
2244 | 2247 |
} |
2245 | 2248 |
|
... | ... | |
2314 | 2317 |
private void zoomAndPanControl_MouseLeave(object sender, MouseEventArgs e) |
2315 | 2318 |
{ |
2316 | 2319 |
///mouseButtonDown = MouseButton.Left; |
2317 |
//this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
2320 |
//this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
2318 | 2321 |
} |
2319 | 2322 |
|
2320 | 2323 |
private void zoomAndPanControl_MouseDoubleClick(object sender, MouseButtonEventArgs e) |
... | ... | |
2712 | 2715 |
CanvasDrawingMouseDownPoint = e.GetPosition(drawingRotateCanvas); |
2713 | 2716 |
canvasZoomPanningMouseDownPoint = e.GetPosition(zoomAndPanCanvas); |
2714 | 2717 |
|
2715 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
2718 |
this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
2716 | 2719 |
SetCursor(); |
2717 | 2720 |
|
2718 | 2721 |
if (!ViewerDataModel.Instance.IsPressCtrl) |
... | ... | |
3133 | 3136 |
|
3134 | 3137 |
CreateCommand.Instance.Execute(currentControl); |
3135 | 3138 |
currentControl = null; |
3136 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
3139 |
this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
3137 | 3140 |
} |
3138 | 3141 |
else |
3139 | 3142 |
{ |
... | ... | |
3171 | 3174 |
|
3172 | 3175 |
currentControl = null; |
3173 | 3176 |
|
3174 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
3177 |
this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
3175 | 3178 |
} |
3176 | 3179 |
else |
3177 | 3180 |
{ |
... | ... | |
4228 | 4231 |
(currentControl as RectangleControl).ApplyOverViewData(); |
4229 | 4232 |
currentControl = null; |
4230 | 4233 |
|
4231 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
4234 |
this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
4232 | 4235 |
|
4233 | 4236 |
if (Common.ViewerDataModel.Instance.SelectedControl == "Batch") |
4234 | 4237 |
{ |
... | ... | |
4271 | 4274 |
CreateCommand.Instance.Execute(currentControl); |
4272 | 4275 |
currentControl = null; |
4273 | 4276 |
|
4274 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
4277 |
this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
4275 | 4278 |
} |
4276 | 4279 |
else |
4277 | 4280 |
{ |
... | ... | |
4313 | 4316 |
CreateCommand.Instance.Execute(currentControl); |
4314 | 4317 |
currentControl = null; |
4315 | 4318 |
|
4316 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
4319 |
this.cursor = new Cursor(App.DefaultArrowCursorStream);
|
|
4317 | 4320 |
} |
4318 | 4321 |
else |
4319 | 4322 |
{ |
내보내기 Unified diff