撤销 Commit ab88c34

2025-07-18 11:49:00 +08:00
parent 17eaf34500
commit 8ab60ad000
4 changed files with 31 additions and 2 deletions
@@ -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;
        }