同步net6分支 (#430)

* improve:pdf插入 * fix:手掌擦 (#419)
2026-04-05 20:49:41 +08:00
parent 998d829783
commit 5eff424b2d
3 changed files with 200 additions and 39 deletions
@@ -3597,6 +3597,11 @@ namespace Ink_Canvas
                    RestoreNonStrokeElements(preservedElements);
                    isInMultiTouchMode = true;

+                    palmEraserWasEnabledBeforeMultiTouch = Settings.Canvas.EnablePalmEraser;
+                    Settings.Canvas.EnablePalmEraser = false;
+                    if (ToggleSwitchEnablePalmEraser != null)
+                        ToggleSwitchEnablePalmEraser.IsOn = false;
+
                    // 恢复到之前的编辑状态
                    inkCanvas.EditingMode = currentEditingMode;
                    drawingShapeMode = currentDrawingShapeMode;
@@ -3627,6 +3632,13 @@ namespace Ink_Canvas
                    RestoreNonStrokeElements(preservedElements);
                    isInMultiTouchMode = false;

+                    if (palmEraserWasEnabledBeforeMultiTouch)
+                    {
+                        Settings.Canvas.EnablePalmEraser = true;
+                        if (ToggleSwitchEnablePalmEraser != null)
+                            ToggleSwitchEnablePalmEraser.IsOn = true;
+                    }
+
                    // 恢复到之前的编辑状态
                    inkCanvas.EditingMode = currentEditingMode;
                    drawingShapeMode = currentDrawingShapeMode;