From ab88c34abcc77820a9a458a4c4e7050f553eee84 Mon Sep 17 00:00:00 2001
From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com>
Date: Wed, 11 Jun 2025 14:03:04 +0800
Subject: [PATCH] fix:issue #23

---
 Ink Canvas/MainWindow.xaml.cs                 |   3 +++
 Ink Canvas/MainWindow_cs/MW_TouchEvents.cs    |   2 ++
 ...vasForClass.csproj.AssemblyReference.cache | Bin 34904 -> 34767 bytes
 .../InkCanvasForClass_MarkupCompile.cache     |   2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 36215707..16f1d181 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -147,12 +147,15 @@ namespace Ink_Canvas {
         private void inkCanvas_EditingModeChanged(object sender, RoutedEventArgs e) {
             var inkCanvas1 = sender as InkCanvas;
             if (inkCanvas1 == null) return;
+            // 修复“显示画笔光标”选项不可用的问题
             if (Settings.Canvas.IsShowCursor) {
+                inkCanvas1.UseCustomCursor = true;
                 if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0)
                     inkCanvas1.ForceCursor = true;
                 else
                     inkCanvas1.ForceCursor = false;
             } else {
+                inkCanvas1.UseCustomCursor = false;
                 inkCanvas1.ForceCursor = false;
             }
 
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index 2a6c6b1f..e2da1058 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs	
@@ -79,6 +79,8 @@ 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
index 0b5fd9240bff6bb31501ffff0de21a426c46b473..932a13132780d6e6d9e8476803f833b9630cf4c8 100644
GIT binary patch
delta 23
ecmcaHf$4ld69*fk4g&)NW8!2(r_hbDMeP7kG6u>3

delta 66
zcmX@#&vat~69*fkE&~GtW8!2(r_hbDMeUPUDuhq=<q}YG)=SCBVPphKGCXj+@m=96
T2S^=PnTei(p0R<kp(O(Vdwvmj

diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
index c6334c11..fea282ed 100644
--- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache	
+++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache	
@@ -16,5 +16,5 @@ E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml
 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
+True