From ee018ea28769bee3ba0a8a13934a5dab07fa7281 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 11:50:44 +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                 |   3 ---
 Ink Canvas/MainWindow_cs/MW_TouchEvents.cs    |   3 ---
 ...vasForClass.csproj.AssemblyReference.cache | Bin 34904 -> 35087 bytes
 .../InkCanvasForClass_MarkupCompile.cache     |  12 ++++++------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 1c23aaf3..9e71192e 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -160,11 +160,9 @@ 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;
@@ -173,7 +171,6 @@ namespace Ink_Canvas {
             } 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 acbf9419..e5c26dfa 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs	
@@ -303,17 +303,14 @@ namespace Ink_Canvas {
             }
             else {
                 isLastTouchEraser = false;
-<<<<<<< HEAD
                 currentPalmEraserShape = null;
                 // 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
                 inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
                 // 修复触屏状态下几何绘制功能不可用的问题：在几何绘制模式下不应该因为forceEraser而直接返回
                 if (forceEraser && drawingShapeMode == 0) return;
-=======
                 inkCanvas.EraserShape =
                     forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
                 if (forceEraser) return;
->>>>>>> parent of b46cbcc (fix:issue #23)
                 inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
             }
         }
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index 0b5fd9240bff6bb31501ffff0de21a426c46b473..93610cbd1b7b1ad281b4eb72a3828e09cd532b79 100644
GIT binary patch
delta 406
zcmcaHfvJBI(}Z)3rW4PLX(i|9=9cDVmQ==g=4C55C+3wU7RPuxI_DRq>ZRo5FfuYQ
zF#L)v+`nbpWI;wFYew6&%$!s!eSLjbD}7IAX9Z_hD5a2_n3<;!H%=d6oIb?3$%^5c
zn=={Zm?oYR*MqA=wbmy;F(tJKZgEc&$l|*klkYRhPS#@-wPmy?%X)~hAO}p&WbE6#
zg=IP;qZ!cm+BlpMo|)$s0e3~fUa<H3*_3>lfT6)y4<uL`fD9nbXh)WVz!t#WQ^x+N
F0RR$Lgp&XO

delta 223
zcmeC5#B^f<(}Z)A4>ODFcse`lI=jYr=4C55C+3wU7RRJy7MH|$Iy&bUrRt^R<S;Ta
zFfdpw>Rp$$bTU7q5hKH7#d6ij3t0L#8#7H{WVD=kUd#ZeAwKzuDXB$pV-in-jJeA(
zS(;gPvJRst#IVf^SX7x9Er15;;xs5cGtVsoZcg_Huyfeil_qPl2qHO2m*Y_b05!Ep
AoB#j-

diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
index c6334c11..0335c48f 100644
--- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache	
+++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache	
@@ -4,17 +4,17 @@
 winexe
 C#
 .cs
-E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\
+E:\ICC CE\ICC CE main\community\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
+E:\ICC CE\ICC CE main\community\Ink Canvas\App.xaml
+201780504554
 
-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;
+72875899768
+46-932173576
+Helpers\Plugins\BuiltIn\SuperLauncher\LauncherSettingsControl.xaml;Helpers\Plugins\BuiltIn\SuperLauncher\LauncherWindow.xaml;MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\AddCustomIconWindow.xaml;Windows\AddPickNameBackgroundWindow.xaml;Windows\CountdownTimerWindow.xaml;Windows\CustomIconWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\ManagePickNameBackgroundsWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\PluginSettingsWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
 
 False