撤销 Commit ab88c34

Ink Canvas/MainWindow.xaml.cs

@@ -160,9 +160,20 @@ namespace Ink_Canvas {
         private void inkCanvas_EditingModeChanged(object sender, RoutedEventArgs e) {
             var inkCanvas1 = sender as InkCanvas;
             if (inkCanvas1 == null) return;
+<<<<<<< HEAD
             
             // 使用辅助方法设置光标
             SetCursorBasedOnEditingMode(inkCanvas1);
+=======
+            if (Settings.Canvas.IsShowCursor) {
+                if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0)
+                    inkCanvas1.ForceCursor = true;
+                else
+                    inkCanvas1.ForceCursor = false;
+            } else {
+                inkCanvas1.ForceCursor = false;
+            }
+>>>>>>> parent of ab88c34 (fix:issue #23)
 
             if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink) forcePointEraser = !forcePointEraser;
         }

Ink Canvas/MainWindow_cs/MW_TouchEvents.cs

@@ -74,8 +74,6 @@ namespace Ink_Canvas {
             }
             else {
                 TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.None;
-                // 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
-                inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
                 inkCanvas.EditingMode = InkCanvasEditingMode.None;
             }
         }

Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache

@@ -0,0 +1,20 @@
+InkCanvasForClass
+
+
+winexe
+C#
+.cs
+E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\
+Ink_Canvas
+none
+false
+TRACE;DEBUG;NETFRAMEWORK;NET472;;NET30_OR_GREATER;NET35_OR_GREATER;NET40_OR_GREATER;NET45_OR_GREATER;NET451_OR_GREATER;NET452_OR_GREATER;NET46_OR_GREATER;NET461_OR_GREATER;NET462_OR_GREATER;NET47_OR_GREATER;NET471_OR_GREATER;NET472_OR_GREATER
+E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml
+13173459795
+
+56-1167124909
+46-47806484
+MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\CountdownTimerWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
+
+False
+