From 463e506ca3bbe33824a04cd782c53fe8ff0ea2d9 Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Sat, 30 Aug 2025 23:28:28 +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/Helpers/GlobalHotkeyManager.cs | 4 ++-- Ink Canvas/MainWindow_cs/MW_Hotkeys.cs | 12 ++++++++++-- Ink Canvas/Windows/HotkeySettingsWindow.xaml | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Ink Canvas/Helpers/GlobalHotkeyManager.cs b/Ink Canvas/Helpers/GlobalHotkeyManager.cs index 07d62a59..dd90ddf7 100644 --- a/Ink Canvas/Helpers/GlobalHotkeyManager.cs +++ b/Ink Canvas/Helpers/GlobalHotkeyManager.cs @@ -238,7 +238,7 @@ namespace Ink_Canvas.Helpers RegisterHotkey("DrawTool", Key.D, ModifierKeys.Alt, () => _mainWindow.PenIcon_Click(null, null)); RegisterHotkey("EraserTool", Key.E, ModifierKeys.Alt, () => _mainWindow.EraserIcon_Click(null, null)); RegisterHotkey("BlackboardTool", Key.B, ModifierKeys.Alt, () => _mainWindow.ImageBlackboard_MouseUp(null, null)); - RegisterHotkey("QuitDrawTool", Key.Q, ModifierKeys.Alt, () => _mainWindow.CursorIcon_Click(null, null)); + RegisterHotkey("QuitDrawTool", Key.Q, ModifierKeys.Alt, () => _mainWindow.KeyChangeToQuitDrawTool(null, null)); // 画笔快捷键 - 使用反射访问penType字段 RegisterHotkey("Pen1", Key.D1, ModifierKeys.Alt, () => SwitchToPenType(0)); @@ -647,7 +647,7 @@ namespace Ink_Canvas.Helpers case "BlackboardTool": return () => _mainWindow.ImageBlackboard_MouseUp(null, null); case "QuitDrawTool": - return () => _mainWindow.CursorIcon_Click(null, null); + return () => _mainWindow.KeyChangeToQuitDrawTool(null, null); case "Pen1": return () => SwitchToPenType(0); case "Pen2": diff --git a/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs b/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs index dc19ff5f..e7bed699 100644 --- a/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs +++ b/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs @@ -79,8 +79,16 @@ namespace Ink_Canvas private void KeyChangeToQuitDrawTool(object sender, ExecutedRoutedEventArgs e) { - if (currentMode != 0) ImageBlackboard_MouseUp(lastBorderMouseDownObject, null); - CursorIcon_Click(lastBorderMouseDownObject, null); + if (currentMode != 0) + { + // 在白板模式下，alt+q 退出白板模式 + ImageBlackboard_MouseUp(lastBorderMouseDownObject, null); + } + else + { + // 在非白板模式下，alt+q 切换到鼠标模式 + CursorIcon_Click(lastBorderMouseDownObject, null); + } } private void KeyChangeToSelect(object sender, ExecutedRoutedEventArgs e) diff --git a/Ink Canvas/Windows/HotkeySettingsWindow.xaml b/Ink Canvas/Windows/HotkeySettingsWindow.xaml index 68bde7dc..8b008b07 100644 --- a/Ink Canvas/Windows/HotkeySettingsWindow.xaml +++ b/Ink Canvas/Windows/HotkeySettingsWindow.xaml @@ -101,8 +101,8 @@ DefaultKey="B" DefaultModifiers="Alt"/>