From 02e143217e4af5a57af5ff8fe29d23e8c9750a1a Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 16:21:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=A6=E6=91=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index e36f7675..db468872 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
@@ -103,10 +103,18 @@ namespace Ink_Canvas {
         }
 
         private void BtnPen_Click(object sender, RoutedEventArgs e) {
+            // 如果当前已是批注模式，再次点击弹出批注子面板
+            if (penType == 0 && inkCanvas.EditingMode == InkCanvasEditingMode.Ink && !drawingAttributes.IsHighlighter) {
+                return;
+            }
+            // 否则只切换到批注模式，不弹出子面板
             forceEraser = false;
             forcePointEraser = false;
             isLastTouchEraser = false;
             drawingShapeMode = 0;
+            penType = 0;
+            drawingAttributes.IsHighlighter = false;
+            drawingAttributes.StylusTip = StylusTip.Ellipse;
             inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
             SetCursorBasedOnEditingMode(inkCanvas);
         }