From 9de6555519c1d0bfd77a87fe4428f0cfff297635 Mon Sep 17 00:00:00 2001
From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com>
Date: Fri, 13 Jun 2025 11:43:50 +0800
Subject: [PATCH] fix:issue #13 #23

---
 Ink Canvas/MainWindow.xaml.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 2ea61b68..f735a141 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -364,15 +364,25 @@ namespace Ink_Canvas {
         // 触摸输入，不隐藏光标
         private void inkCanvas_TouchDown(object sender, TouchEventArgs e)
         {
-            inkCanvas.ForceCursor = false;
-            System.Windows.Forms.Cursor.Show();
+            // 修改：根据用户设置决定是否强制显示自定义光标
+            if (Settings.Canvas.IsShowCursor) {
+                inkCanvas.ForceCursor = true;
+            } else {
+                inkCanvas.ForceCursor = false;
+                System.Windows.Forms.Cursor.Show();
+            }
         }
 
         // 触摸结束，恢复光标
         private void inkCanvas_TouchUp(object sender, TouchEventArgs e)
         {
-            inkCanvas.ForceCursor = false;
-            System.Windows.Forms.Cursor.Show();
+            // 修改：根据当前模式和设置恢复光标状态
+            if (Settings.Canvas.IsShowCursor && inkCanvas.EditingMode == InkCanvasEditingMode.Ink) {
+                inkCanvas.ForceCursor = true;
+            } else {
+                inkCanvas.ForceCursor = false;
+                System.Windows.Forms.Cursor.Show();
+            }
         }
 
         #endregion Definations and Loading