Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ColorPicker] Close only flyout with escape key (#12441)

Browse Source 
When the escape key is pressed in the Color Picker editor, only the
adjust color flyout should be closed instead of the whole window.
This commit is contained in:
Jaime Bernardo
2021-07-27 10:31:43 +01:00
committed by GitHub
parent 5e4f50fa45
commit 65618ffa9c
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml
View File

@@ -297,6 +297,7 @@
<ui:FlyoutService.Flyout>
<ui:Flyout x:Name="DetailsFlyout"
Placement="Bottom"
Opened="DetailsFlyout_Opened"
Closed="DetailsFlyout_Closed">
<Grid Margin="0,4,0,12"
KeyboardNavigation.TabNavigation="Contained"

10
src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs
View File

@@ -242,6 +242,7 @@ namespace ColorPicker.Controls
#pragma warning restore CA1801 // Review unused parameters
{
HideDetails();
AppStateHandler.BlockEscapeKeyClosingColorPickerEditor = false;
// Revert to original color
var originalColorBackground = new SolidColorBrush(_originalColor);
@@ -250,6 +251,15 @@ namespace ColorPicker.Controls
HexCode.Text = ColorToHex(_originalColor);
}
#pragma warning disable CA1822 // Mark members as static
#pragma warning disable CA1801 // Review unused parameters
private void DetailsFlyout_Opened(object sender, object e)
#pragma warning restore CA1801 // Review unused parameters
#pragma warning restore CA1822 // Mark members as static
{
AppStateHandler.BlockEscapeKeyClosingColorPickerEditor = true;
}
private void ColorVariationButton_Click(object sender, RoutedEventArgs e)
{
var selectedColor = ((SolidColorBrush)((Button)sender).Background).Color;

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

@@ -20,6 +20,9 @@ namespace ColorPicker.Helpers
private bool _colorPickerShown;
private object _colorPickerVisibilityLock = new object();
// Blocks using the escape key to close the color picker editor when the adjust color flyout is open.
public static bool BlockEscapeKeyClosingColorPickerEditor { get; set; }
[ImportingConstructor]
public AppStateHandler(IColorEditorViewModel colorEditorViewModel, IUserSettings userSettings)
{
@@ -36,6 +39,7 @@ namespace ColorPicker.Helpers
public void StartUserSession()
{
EndUserSession(); // Ends current user session if there's an active one.
lock (_colorPickerVisibilityLock)
{
if (!_colorPickerShown && !IsColorPickerEditorVisible())
@@ -149,7 +153,7 @@ namespace ColorPicker.Helpers
}
}
private bool IsColorPickerEditorVisible()
public bool IsColorPickerEditorVisible()
{
if (_colorEditorWindow != null)
{
@@ -160,6 +164,11 @@ namespace ColorPicker.Helpers
return false;
}
public bool IsColorPickerVisible()
{
return _colorPickerShown;
}
private void MainWindow_Closed(object sender, EventArgs e)
{
AppClosed?.Invoke(this, EventArgs.Empty);

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

@@ -70,10 +70,17 @@ namespace ColorPicker.Keyboard
var virtualCode = e.KeyboardData.VirtualCode;
// ESC pressed
if (virtualCode == KeyInterop.VirtualKeyFromKey(Key.Escape))
if (virtualCode == KeyInterop.VirtualKeyFromKey(Key.Escape)
&& e.KeyboardState == GlobalKeyboardHook.KeyboardState.KeyDown
)
{
e.Handled = _appStateHandler.EndUserSession();
return;
if (_appStateHandler.IsColorPickerVisible()
|| !AppStateHandler.BlockEscapeKeyClosingColorPickerEditor
)
{
e.Handled = _appStateHandler.EndUserSession();
return;
}
}
if ((System.Windows.Application.Current as ColorPickerUI.App).IsRunningDetachedFromPowerToys())