Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 19:57:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

[ColorPicker]Only close on escape if focused (#37895)

Browse Source
This commit is contained in:
PesBandi
2025-04-15 05:15:41 +02:00
committed by GitHub
parent 293fa262bb
commit 21aa49cefb
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
View File

@@ -222,7 +222,7 @@ namespace ColorPicker.Helpers
public bool HandleEnterPressed() public bool HandleEnterPressed()
{ {
if (!IsColorPickerVisible()) if (!_colorPickerShown)
{ {
return false; return false;
} }
@@ -233,14 +233,13 @@ namespace ColorPicker.Helpers
public bool HandleEscPressed() public bool HandleEscPressed()
{ {
if (!BlockEscapeKeyClosingColorPickerEditor) if (!BlockEscapeKeyClosingColorPickerEditor
&& (_colorPickerShown || (_colorEditorWindow != null && _colorEditorWindow.IsActive)))
{ {
return EndUserSession(); return EndUserSession();
} }
else
{ return false;
return false;
}
} }
internal void MoveCursor(int xOffset, int yOffset) internal void MoveCursor(int xOffset, int yOffset)

13
src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs
View File

@@ -70,17 +70,10 @@ namespace ColorPicker.Keyboard
var virtualCode = e.KeyboardData.VirtualCode; var virtualCode = e.KeyboardData.VirtualCode;
// ESC pressed // ESC pressed
if (virtualCode == KeyInterop.VirtualKeyFromKey(Key.Escape) if (virtualCode == KeyInterop.VirtualKeyFromKey(Key.Escape) && e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown)
&& e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown
)
{ {
if (_appStateHandler.IsColorPickerVisible() e.Handled = _appStateHandler.HandleEscPressed();
|| !AppStateHandler.BlockEscapeKeyClosingColorPickerEditor return;
)
{
e.Handled = _appStateHandler.EndUserSession();
return;
}
} }
if ((virtualCode == KeyInterop.VirtualKeyFromKey(Key.Space) || virtualCode == KeyInterop.VirtualKeyFromKey(Key.Enter)) && (e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown)) if ((virtualCode == KeyInterop.VirtualKeyFromKey(Key.Space) || virtualCode == KeyInterop.VirtualKeyFromKey(Key.Enter)) && (e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown))