From a8bc9f442b69dd9cf38593e311925b54db157d25 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 25 Apr 2026 17:22:52 +0800
Subject: [PATCH] =?UTF-8?q?improve:=E5=BF=AB=E6=8D=B7=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_Hotkeys.cs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs b/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs
index c2b1e0ff..c10030ae 100644
--- a/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs	
@@ -104,8 +104,12 @@ namespace Ink_Canvas
         /// </summary>
         /// <param name="sender">发送者</param>
         /// <param name="e">执行路由事件参数</param>
-        private void KeyChangeToDrawTool(object sender, ExecutedRoutedEventArgs e)
+        private async void KeyChangeToDrawTool(object sender, ExecutedRoutedEventArgs e)
         {
+            if (isFloatingBarFolded)
+            {
+                await UnFoldFloatingBar(new object());
+            }
             PenIcon_Click(lastBorderMouseDownObject, null);
         }
 
@@ -150,15 +154,17 @@ namespace Ink_Canvas
         /// <param name="sender">发送者</param>
         /// <param name="e">执行路由事件参数</param>
         /// <remarks>仅当画布控件面板可见时生效，根据当前橡皮擦状态选择相应的橡皮擦模式</remarks>
-        private void KeyChangeToEraser(object sender, ExecutedRoutedEventArgs e)
+        private async void KeyChangeToEraser(object sender, ExecutedRoutedEventArgs e)
         {
-            if (StackPanelCanvasControls.Visibility == Visibility.Visible)
+            if (isFloatingBarFolded)
             {
-                if (Eraser_Icon.Background != null)
-                    EraserIconByStrokes_Click(lastBorderMouseDownObject, null);
-                else
-                    EraserIcon_Click(lastBorderMouseDownObject, null);
+                await UnFoldFloatingBar(new object());
             }
+
+            if (Eraser_Icon.Background != null)
+                EraserIconByStrokes_Click(lastBorderMouseDownObject, null);
+            else
+                EraserIcon_Click(lastBorderMouseDownObject, null);
         }
 
         /// <summary>