개정판 510cbd2a
issue #747 마우스 Cursor의 가독성 향상 수정
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 33 | 33 |
using System.Windows.Threading; |
| 34 | 34 |
using System.Diagnostics; |
| 35 | 35 |
using System.Threading; |
| 36 |
using System.Windows.Resources; |
|
| 36 | 37 |
|
| 37 | 38 |
namespace KCOM.Views |
| 38 | 39 |
{
|
| ... | ... | |
| 367 | 368 |
private static Timer timer; |
| 368 | 369 |
private int InitInterval = KCOM.Properties.Settings.Default.InitInterval; |
| 369 | 370 |
private void MainMenu_Loaded(object sender, RoutedEventArgs e) |
| 370 |
{
|
|
| 371 |
////측정 |
|
| 372 |
//Stopwatch sw = new Stopwatch(); |
|
| 373 |
//sw.Start(); |
|
| 374 |
InitializeComponent(); |
|
| 371 |
{
|
|
| 372 |
InitializeComponent(); |
|
| 373 |
|
|
| 375 | 374 |
//System.Diagnostics.Debug.WriteLine("MainMenu() : " + sw.ElapsedMilliseconds.ToString() + "ms");
|
| 376 | 375 |
|
| 377 | 376 |
if (App.ParameterMode) |
| ... | ... | |
| 2548 | 2547 |
} |
| 2549 | 2548 |
else |
| 2550 | 2549 |
{
|
| 2551 |
this.cursor = Cursors.Arrow; |
|
| 2550 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
|
| 2551 |
|
|
| 2552 | 2552 |
SetCursor(); |
| 2553 | 2553 |
} |
| 2554 | 2554 |
} |
| ... | ... | |
| 2626 | 2626 |
{
|
| 2627 | 2627 |
if (mouseHandlingMode == MouseHandlingMode.Drawing) |
| 2628 | 2628 |
{
|
| 2629 |
this.cursor = Cursors.Arrow;
|
|
| 2629 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
| 2630 | 2630 |
|
| 2631 | 2631 |
SetCursor(); |
| 2632 | 2632 |
|
| ... | ... | |
| 2703 | 2703 |
} |
| 2704 | 2704 |
else if (mouseButtonDown == MouseButton.Right) |
| 2705 | 2705 |
{
|
| 2706 |
this.cursor = Cursors.Arrow;
|
|
| 2706 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
| 2707 | 2707 |
SetCursor(); |
| 2708 | 2708 |
} |
| 2709 | 2709 |
|
| ... | ... | |
| 2714 | 2714 |
} |
| 2715 | 2715 |
else |
| 2716 | 2716 |
{
|
| 2717 |
this.cursor = Cursors.Arrow;
|
|
| 2717 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
| 2718 | 2718 |
SetCursor(); |
| 2719 | 2719 |
} |
| 2720 | 2720 |
mouseButtonDown = MouseButton.Left; |
| ... | ... | |
| 2730 | 2730 |
private void zoomAndPanControl_MouseLeave(object sender, MouseEventArgs e) |
| 2731 | 2731 |
{
|
| 2732 | 2732 |
mouseButtonDown = MouseButton.Left; |
| 2733 |
this.Cursor = Cursors.Arrow;
|
|
| 2733 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
| 2734 | 2734 |
} |
| 2735 | 2735 |
|
| 2736 | 2736 |
private void zoomAndPanControl_MouseDoubleClick(object sender, MouseButtonEventArgs e) |
| ... | ... | |
| 3071 | 3071 |
canvasDrawingMouseDownPoint = e.GetPosition(drawingRotateCanvas); |
| 3072 | 3072 |
canvasZoomPanningMouseDownPoint = e.GetPosition(zoomAndPanCanvas); |
| 3073 | 3073 |
|
| 3074 |
this.cursor = Cursors.Arrow;
|
|
| 3074 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource);
|
|
| 3075 | 3075 |
SetCursor(); |
| 3076 | 3076 |
|
| 3077 | 3077 |
if (!ViewerDataModel.Instance.IsPressCtrl) |
| ... | ... | |
| 3371 | 3371 |
|
| 3372 | 3372 |
(currentControl as RectangleControl).ApplyOverViewData(); |
| 3373 | 3373 |
currentControl = null; |
| 3374 |
this.cursor = Cursors.Arrow; |
|
| 3374 |
|
|
| 3375 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
|
| 3375 | 3376 |
} |
| 3376 | 3377 |
else |
| 3377 | 3378 |
{
|
| ... | ... | |
| 3410 | 3411 |
|
| 3411 | 3412 |
(currentControl as RectCloudControl).ApplyOverViewData(); |
| 3412 | 3413 |
currentControl = null; |
| 3413 |
this.cursor = Cursors.Arrow; |
|
| 3414 |
|
|
| 3415 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
|
| 3414 | 3416 |
} |
| 3415 | 3417 |
else |
| 3416 | 3418 |
{
|
| ... | ... | |
| 4575 | 4577 |
CreateControl(); |
| 4576 | 4578 |
(currentControl as RectangleControl).ApplyOverViewData(); |
| 4577 | 4579 |
currentControl = null; |
| 4578 |
this.cursor = Cursors.Arrow; |
|
| 4580 |
|
|
| 4581 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
|
| 4579 | 4582 |
|
| 4580 | 4583 |
if (Common.ViewerDataModel.Instance.SelectedControl == "Batch") |
| 4581 | 4584 |
{
|
| ... | ... | |
| 4616 | 4619 |
} |
| 4617 | 4620 |
CreateControl(); |
| 4618 | 4621 |
currentControl = null; |
| 4619 |
this.cursor = Cursors.Arrow; |
|
| 4622 |
|
|
| 4623 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
|
| 4620 | 4624 |
} |
| 4621 | 4625 |
else |
| 4622 | 4626 |
{
|
| ... | ... | |
| 4655 | 4659 |
|
| 4656 | 4660 |
CreateControl(); |
| 4657 | 4661 |
currentControl = null; |
| 4658 |
this.cursor = Cursors.Arrow; |
|
| 4662 |
|
|
| 4663 |
|
|
| 4664 |
this.cursor = new Cursor(MainWindow.CursorChange().StreamSource); |
|
| 4659 | 4665 |
} |
| 4660 | 4666 |
else |
| 4661 | 4667 |
{
|
| ... | ... | |
| 6222 | 6228 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final); |
| 6223 | 6229 |
} |
| 6224 | 6230 |
} |
| 6231 |
|
|
| 6225 | 6232 |
} |
| 6226 | 6233 |
} |
내보내기 Unified diff
