From 17eaf34500db5b652676f4d7cd266e166291fd37 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 11:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E9=94=80=20Commit=20b46cbcc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index 830c288d..547f891c 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs	
@@ -305,11 +305,17 @@ 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;
             }
         }