Skip to content

[ColorPicker]Only close on escape if focused #37895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shuaiyuanxx merged 1 commit into from
Apr 15, 2025
Merged

[ColorPicker]Only close on escape if focused #37895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ internal void RegisterWindowHandle(System.Windows.Interop.HwndSource hwndSource)

public bool HandleEnterPressed()
{
if (!IsColorPickerVisible())
if (!_colorPickerShown)
{
return false;
}
Expand All @@ -241,14 +241,13 @@ public bool HandleEnterPressed()

public bool HandleEscPressed()
{
if (!BlockEscapeKeyClosingColorPickerEditor)
if (!BlockEscapeKeyClosingColorPickerEditor
&& (_colorPickerShown || (_colorEditorWindow != null && _colorEditorWindow.IsActive)))
{
return EndUserSession();
}
else
{
return false;
}

return false;
}

internal void MoveCursor(int xOffset, int yOffset)
Expand Down
13 changes: 3 additions & 10 deletions src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,10 @@ private void Hook_KeyboardPressed(object sender, GlobalKeyboardHookEventArgs e)
var virtualCode = e.KeyboardData.VirtualCode;

// ESC pressed
if (virtualCode == KeyInterop.VirtualKeyFromKey(Key.Escape)
&& e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown
)
if (virtualCode == KeyInterop.VirtualKeyFromKey(Key.Escape) && e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown)
{
if (_appStateHandler.IsColorPickerVisible()
|| !AppStateHandler.BlockEscapeKeyClosingColorPickerEditor
)
{
e.Handled = _appStateHandler.EndUserSession();
return;
}
e.Handled = _appStateHandler.HandleEscPressed();
return;
}

if ((virtualCode == KeyInterop.VirtualKeyFromKey(Key.Space) || virtualCode == KeyInterop.VirtualKeyFromKey(Key.Enter)) && (e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown))
Expand Down
Loading