From 8ab60ad000c5b1d248bfbc3241df81bbbd7ab3c6 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 11:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E9=94=80=20Commit=20ab88c34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml.cs                 |  11 ++++++++++
 Ink Canvas/MainWindow_cs/MW_TouchEvents.cs    |   2 --
 ...vasForClass.csproj.AssemblyReference.cache | Bin 0 -> 34904 bytes
 .../InkCanvasForClass_MarkupCompile.cache     |  20 ++++++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
 create mode 100644 Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index d4e7bf43..1c23aaf3 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/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;
         }
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index 547f891c..acbf9419 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs	
+++ b/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;
             }
         }
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
new file mode 100644
index 0000000000000000000000000000000000000000..0b5fd9240bff6bb31501ffff0de21a426c46b473
GIT binary patch
literal 34904
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

literal 0
HcmV?d00001

diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
new file mode 100644
index 00000000..c6334c11
--- /dev/null
+++ b/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
+