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

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

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 16f1d181..0cb84fb8 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -150,7 +150,9 @@ namespace Ink_Canvas {
             // 修复“显示画笔光标”选项不可用的问题
             if (Settings.Canvas.IsShowCursor) {
                 inkCanvas1.UseCustomCursor = true;
-                if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0)
+                // 修复触屏时光标不显示：只要有输入设备悬停就显示
+                if ((inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0)
+                    && (inkCanvas1.IsStylusDirectlyOver || inkCanvas1.IsMouseDirectlyOver))
                     inkCanvas1.ForceCursor = true;
                 else
                     inkCanvas1.ForceCursor = false;
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index 932a13132780d6e6d9e8476803f833b9630cf4c8..0b5fd9240bff6bb31501ffff0de21a426c46b473 100644
GIT binary patch
delta 66
zcmX@#&vat~69*fkE&~GtW8!2(r_hbDMeUPUDuhq=<q}YG)=SCBVPphKGCXj+@m=96
T2S^=PnTei(p0R<kp(O(Vdwvmj

delta 23
ecmcaHf$4ld69*fk4g&)NW8!2(r_hbDMeP7kG6u>3

diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
index fea282ed..c6334c11 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;
 
-True
+False