From b20e4a041f0f97c7afccefa33e18ed1ccb7532e1 Mon Sep 17 00:00:00 2001
From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com>
Date: Tue, 17 Jun 2025 18:45:55 +0800
Subject: [PATCH] fix:issue #13 #23

---
 Ink Canvas/MainWindow.xaml                    |   2 +-
 Ink Canvas/MainWindow.xaml.cs                 |  17 ++--
 Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs   |  74 ++++++++++++++++--
 Ink Canvas/MainWindow_cs/MW_TouchEvents.cs    |   5 ++
 .../net472/InkCanvasForClass.g.resources      | Bin 5162515 -> 5162553 bytes
 Ink Canvas/obj/Debug/net472/MainWindow.g.cs   |   2 +-
 Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs |   2 +-
 7 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index faf2da25..744ee94e 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -2390,7 +2390,7 @@
         <Grid Name="GridTransparencyFakeBackground" Opacity="0" />
         <Label Name="Label" Visibility="Collapsed" Foreground="Gray" Content="0" />
         <Grid Name="InkCanvasGridForInkReplay">
-            <InkCanvas x:Name="inkCanvas" ForceCursor="False"
+            <InkCanvas x:Name="inkCanvas" ForceCursor="True" UseCustomCursor="True"
                        TouchUp="Main_Grid_TouchUp" TouchDown="Main_Grid_TouchDown"
                        TouchMove="inkCanvas_TouchMove"
                        ManipulationDelta="Main_Grid_ManipulationDelta"
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 668f62bf..96660d89 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -154,16 +154,11 @@ 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;
-                // 修复触屏和数位笔时光标不显示：只要有输入设备悬停、捕获，或有任何Stylus设备连接就显示
-                if ((inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0)
-                    && (inkCanvas1.IsStylusDirectlyOver || inkCanvas1.IsMouseDirectlyOver || inkCanvas1.IsStylusCaptured || inkCanvas1.IsMouseCaptured
-                        || Stylus.CurrentStylusDevice != null))
-                    inkCanvas1.ForceCursor = true;
-                else
-                    inkCanvas1.ForceCursor = false;
+                // 修复触屏和数位笔时光标不显示：强制显示光标，不再依赖鼠标或触控状态
+                inkCanvas1.ForceCursor = true;
             } else {
                 inkCanvas1.UseCustomCursor = false;
                 inkCanvas1.ForceCursor = false;
@@ -368,6 +363,8 @@ namespace Ink_Canvas {
             if (Settings.Canvas.IsShowCursor)
             {
                 inkCanvas.ForceCursor = true;
+                // 确保鼠标光标对触摸可见
+                System.Windows.Forms.Cursor.Show();
                 // 新增：当处于套索选择模式时保持光标可见
                 if (inkCanvas.EditingMode == InkCanvasEditingMode.Select)
                     inkCanvas.Cursor = Cursors.Cross;
@@ -383,8 +380,10 @@ namespace Ink_Canvas {
         private void inkCanvas_TouchUp(object sender, TouchEventArgs e)
         {
             // 修改：根据当前模式和设置恢复光标状态
-            if (Settings.Canvas.IsShowCursor && inkCanvas.EditingMode == InkCanvasEditingMode.Ink) {
+            if (Settings.Canvas.IsShowCursor) {
                 inkCanvas.ForceCursor = true;
+                // 确保鼠标光标对触摸可见
+                System.Windows.Forms.Cursor.Show();
             } else {
                 inkCanvas.ForceCursor = false;
                 System.Windows.Forms.Cursor.Show();
diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index f964ed5e..4bce1cc6 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
@@ -56,7 +56,7 @@ namespace Ink_Canvas {
         #endregion Floating Bar Control
 
         private int drawingShapeMode = 0;
-        private bool isLongPressSelected = false; // 用于存是否是“选中”状态，便于后期抬笔后不做切换到笔的处理
+        private bool isLongPressSelected = false; // 用于存是否是"选中"状态，便于后期抬笔后不做切换到笔的处理
 
         #region Buttons
 
@@ -429,6 +429,8 @@ namespace Ink_Canvas {
 
         private void inkCanvas_TouchMove(object sender, TouchEventArgs e) {
             if (isSingleFingerDragMode) return;
+
+            // 处理形状绘制模式
             if (drawingShapeMode != 0) {
                 if (isLastTouchEraser) return;
                 //EraserContainer.Background = null;
@@ -443,15 +445,75 @@ namespace Ink_Canvas {
                     catch {
                         Trace.WriteLine("lastTempStrokeCollection failed.");
                     }
-
                     return;
                 }
-
-                if (inkCanvas.EditingMode != InkCanvasEditingMode.None)
-                    inkCanvas.EditingMode = InkCanvasEditingMode.None;
             }
 
-            MouseTouchMove(e.GetTouchPoint(inkCanvas).Position);
+            // 触摸移动时保持自定义光标显示
+            if (Settings.Canvas.IsShowCursor) {
+                inkCanvas.ForceCursor = true;
+                System.Windows.Forms.Cursor.Show();
+            }
+
+            if (NeedUpdateIniP()) iniP = e.GetTouchPoint(inkCanvas).Position;
+            if (drawingShapeMode == 9 && isFirstTouchCuboid == false) MouseTouchMove(iniP);
+            inkCanvas.Opacity = 1;
+            double boundsWidth = GetTouchBoundWidth(e), eraserMultiplier = 1.0;
+            if (!Settings.Advanced.EraserBindTouchMultiplier && Settings.Advanced.IsSpecialScreen)
+                eraserMultiplier = 1 / Settings.Advanced.TouchMultiplier;
+            if (boundsWidth > BoundsWidth) {
+                isLastTouchEraser = true;
+                if (drawingShapeMode == 0 && forceEraser) return;
+                if (boundsWidth > BoundsWidth * 2.5) {
+                    double k = 1;
+                    switch (Settings.Canvas.EraserSize) {
+                        case 0:
+                            k = 0.5;
+                            break;
+                        case 1:
+                            k = 0.8;
+                            break;
+                        case 3:
+                            k = 1.25;
+                            break;
+                        case 4:
+                            k = 1.8;
+                            break;
+                    }
+
+                    inkCanvas.EraserShape = new EllipseStylusShape(boundsWidth * k * eraserMultiplier,
+                        boundsWidth * k * eraserMultiplier);
+                    inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
+                }
+                else {
+                    if (StackPanelPPTControls.Visibility == Visibility.Visible && inkCanvas.Strokes.Count == 0 &&
+                        Settings.PowerPointSettings.IsEnableFingerGestureSlideShowControl) {
+                        isLastTouchEraser = false;
+                        inkCanvas.EditingMode = InkCanvasEditingMode.GestureOnly;
+                        inkCanvas.Opacity = 0.1;
+                    }
+                    else {
+                        inkCanvas.EraserShape = new EllipseStylusShape(5, 5);
+                        inkCanvas.EditingMode = InkCanvasEditingMode.EraseByStroke;
+                    }
+                }
+            }
+            else {
+                isLastTouchEraser = false;
+                // 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
+                inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
+                if (forceEraser) return;
+                inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+            }
+
+            if (inkCanvas.EditingMode != InkCanvasEditingMode.None)
+                return;
+
+            if (e.TouchDevice == null) {
+                System.Windows.Forms.Cursor.Show();
+            } else {
+                System.Windows.Forms.Cursor.Hide();
+            }
         }
 
         private int drawMultiStepShapeCurrentStep = 0; //多笔完成的图形 当前所处在的笔画
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index e2da1058..db9e4a3d 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs	
@@ -183,6 +183,11 @@ namespace Ink_Canvas {
         private bool forcePointEraser = true;
 
         private void Main_Grid_TouchDown(object sender, TouchEventArgs e) {
+            // 确保触摸时显示自定义光标
+            if (Settings.Canvas.IsShowCursor) {
+                inkCanvas.ForceCursor = true;
+                System.Windows.Forms.Cursor.Show();
+            }
 
             inkCanvas.CaptureTouch(e.TouchDevice);
             ViewboxFloatingBar.IsHitTestVisible = false;
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.g.resources b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.g.resources
index db7cd2ee717fa8aa5500a9adb80f02461dd7d18d..b290927b7dd3b62286e607ad19195cb2c4132585 100644
GIT binary patch
delta 6529
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

delta 6503
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

diff --git a/Ink Canvas/obj/Debug/net472/MainWindow.g.cs b/Ink Canvas/obj/Debug/net472/MainWindow.g.cs
index 0fbdf474..e43cc3be 100644
--- a/Ink Canvas/obj/Debug/net472/MainWindow.g.cs	
+++ b/Ink Canvas/obj/Debug/net472/MainWindow.g.cs	
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "467145DD780C5E147BCA6025B5E2B49160B6EF9E"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1D11E3F5636ADFC403B4C9CD768CCA9048DA6765"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
diff --git a/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs b/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs
index 0fbdf474..e43cc3be 100644
--- a/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs	
+++ b/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs	
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "467145DD780C5E147BCA6025B5E2B49160B6EF9E"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1D11E3F5636ADFC403B4C9CD768CCA9048DA6765"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。