From bdb8bed053a7c36322975f1dfb0af9b168f91d30 Mon Sep 17 00:00:00 2001 From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com> Date: Sat, 1 Nov 2025 18:25:35 +0800 Subject: [PATCH] fix:issue #210 --- .../MainWindow_cs/MW_FloatingBarIcons.cs | 2 - Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 52 ------------------- 2 files changed, 54 deletions(-) diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index cda7fc79..15ec65ea 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -2866,8 +2866,6 @@ namespace Ink_Canvas // 恢复非笔画元素 RestoreNonStrokeElements(preservedElements); - CancelSingleFingerDragMode(); - if (Settings.Canvas.ClearCanvasAndClearTimeMachine) timeMachine.ClearStrokeHistory(); } diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs index 2cfe181a..e0878d90 100644 --- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs +++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs @@ -799,58 +799,6 @@ namespace Ink_Canvas isMultiTouchTimerActive = false; } - - // 当手掌擦激活且所有触摸点都抬起时,恢复原编辑模式 - if (isPalmEraserActive && dec.Count == 0) - { - LogHelper.WriteLogToFile($"Palm eraser recovery triggered - Touch points remaining: {dec.Count}"); - - // 恢复高光状态 - drawingAttributes.IsHighlighter = palmEraserLastIsHighlighter; - - // 恢复编辑模式 - try - { - if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) - { - // 根据之前的状态恢复 - switch (palmEraserLastEditingMode) - { - case InkCanvasEditingMode.Ink: - PenIcon_Click(null, null); - break; - case InkCanvasEditingMode.Select: - SymbolIconSelect_MouseUp(null, null); - break; - default: - inkCanvas.EditingMode = palmEraserLastEditingMode; - break; - } - - LogHelper.WriteLogToFile($"Palm eraser recovered to mode: {palmEraserLastEditingMode}"); - } - } - catch (Exception ex) - { - // 如果恢复失败,强制切换到批注模式 - LogHelper.WriteLogToFile($"Palm eraser recovery failed: {ex.Message}, forcing to Ink mode", LogHelper.LogType.Error); - inkCanvas.EditingMode = InkCanvasEditingMode.Ink; - } - - // 重置手掌擦状态 - isPalmEraserActive = false; - - // 禁用橡皮擦覆盖层 - DisableEraserOverlay(); - if (Settings.Canvas.IsShowCursor) - { - inkCanvas.ForceCursor = true; - inkCanvas.UseCustomCursor = true; - } - - LogHelper.WriteLogToFile("Palm eraser state reset completed"); - } - if (drawingShapeMode != 0) { isTouchDown = false;