Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit d7bb081

Browse files
committed
fix some windows missing escape key to exit shortcut
1 parent 32af9b8 commit d7bb081

File tree

5 files changed

+22
-2
lines changed

5 files changed

+22
-2
lines changed

UI/MainWindow/MainWindowMenuHandler.cs

+2
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ private void Menu_Help(object sender, RoutedEventArgs e)
223223
private void Menu_OpenSPDef(object sender, RoutedEventArgs e)
224224
{
225225
var spDefinitionWindow = new SPDefinitionWindow { Owner = this, ShowInTaskbar = false };
226+
DimmMainWindow();
226227
spDefinitionWindow.ShowDialog();
228+
RestoreMainWindow();
227229
}
228230

229231
private void Menu_OpenOptions(object sender, RoutedEventArgs e)

UI/Windows/ConfigWindow.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
Title="Configurations"
1313
TitleCaps="False"
1414
ShowTitleBar="true"
15-
Closing="MetroWindow_Closing">
15+
Closing="MetroWindow_Closing"
16+
KeyDown="MetroWindow_KeyDown">
1617

1718
<controls:MetroWindow.Resources>
1819
<ResourceDictionary>

UI/Windows/ConfigWindow.xaml.cs

+8
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,14 @@ private void SidebarColumn_SizeChanged(object sender, SizeChangedEventArgs e)
778778
DeleteButtonText.Visibility = Visibility.Visible;
779779
}
780780
}
781+
782+
private void MetroWindow_KeyDown(object sender, KeyEventArgs e)
783+
{
784+
if (e.Key == Key.Escape)
785+
{
786+
Close();
787+
}
788+
}
781789
#endregion
782790

783791
#region Methods

UI/Windows/SPDefinitionWindow.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
WindowStartupLocation="CenterOwner"
99
GlowBrush="{DynamicResource AccentColorBrush}"
1010
ShowTitleBar="True"
11-
TitleCharacterCasing="Normal">
11+
TitleCharacterCasing="Normal"
12+
KeyDown="MetroWindow_KeyDown">
1213

1314
<controls:MetroWindow.Resources>
1415
<ResourceDictionary>

UI/Windows/SPDefinitionWindow.xaml.cs

+8
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,14 @@ private void SPFunctionsListBox_KeyDown(object sender, KeyEventArgs e)
255255
}
256256
}
257257

258+
private void MetroWindow_KeyDown(object sender, KeyEventArgs e)
259+
{
260+
if (e.Key == Key.Escape)
261+
{
262+
Close();
263+
}
264+
}
265+
258266
private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
259267
{
260268
SPProgress.IsIndeterminate = true;

0 commit comments

Comments
 (0)