improve:快捷键
This commit is contained in:
@@ -238,7 +238,7 @@ namespace Ink_Canvas.Helpers
|
|||||||
RegisterHotkey("DrawTool", Key.D, ModifierKeys.Alt, () => _mainWindow.PenIcon_Click(null, null));
|
RegisterHotkey("DrawTool", Key.D, ModifierKeys.Alt, () => _mainWindow.PenIcon_Click(null, null));
|
||||||
RegisterHotkey("EraserTool", Key.E, ModifierKeys.Alt, () => _mainWindow.EraserIcon_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("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字段
|
// 画笔快捷键 - 使用反射访问penType字段
|
||||||
RegisterHotkey("Pen1", Key.D1, ModifierKeys.Alt, () => SwitchToPenType(0));
|
RegisterHotkey("Pen1", Key.D1, ModifierKeys.Alt, () => SwitchToPenType(0));
|
||||||
@@ -647,7 +647,7 @@ namespace Ink_Canvas.Helpers
|
|||||||
case "BlackboardTool":
|
case "BlackboardTool":
|
||||||
return () => _mainWindow.ImageBlackboard_MouseUp(null, null);
|
return () => _mainWindow.ImageBlackboard_MouseUp(null, null);
|
||||||
case "QuitDrawTool":
|
case "QuitDrawTool":
|
||||||
return () => _mainWindow.CursorIcon_Click(null, null);
|
return () => _mainWindow.KeyChangeToQuitDrawTool(null, null);
|
||||||
case "Pen1":
|
case "Pen1":
|
||||||
return () => SwitchToPenType(0);
|
return () => SwitchToPenType(0);
|
||||||
case "Pen2":
|
case "Pen2":
|
||||||
|
|||||||
@@ -79,8 +79,16 @@ namespace Ink_Canvas
|
|||||||
|
|
||||||
private void KeyChangeToQuitDrawTool(object sender, ExecutedRoutedEventArgs e)
|
private void KeyChangeToQuitDrawTool(object sender, ExecutedRoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (currentMode != 0) ImageBlackboard_MouseUp(lastBorderMouseDownObject, null);
|
if (currentMode != 0)
|
||||||
CursorIcon_Click(lastBorderMouseDownObject, null);
|
{
|
||||||
|
// 在白板模式下,alt+q 退出白板模式
|
||||||
|
ImageBlackboard_MouseUp(lastBorderMouseDownObject, null);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 在非白板模式下,alt+q 切换到鼠标模式
|
||||||
|
CursorIcon_Click(lastBorderMouseDownObject, null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void KeyChangeToSelect(object sender, ExecutedRoutedEventArgs e)
|
private void KeyChangeToSelect(object sender, ExecutedRoutedEventArgs e)
|
||||||
|
|||||||
@@ -101,8 +101,8 @@
|
|||||||
DefaultKey="B"
|
DefaultKey="B"
|
||||||
DefaultModifiers="Alt"/>
|
DefaultModifiers="Alt"/>
|
||||||
<local:HotkeyItem x:Name="QuitDrawToolHotkey"
|
<local:HotkeyItem x:Name="QuitDrawToolHotkey"
|
||||||
Title="退出绘图"
|
Title="退出绘图/白板"
|
||||||
Description="退出绘图模式"
|
Description="退出绘图模式或白板模式"
|
||||||
DefaultKey="Q"
|
DefaultKey="Q"
|
||||||
DefaultModifiers="Alt"/>
|
DefaultModifiers="Alt"/>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
|
|||||||
Reference in New Issue
Block a user