fix some windows missing escape key to exit shortcut

SPCodeOrg · Oct 18, 2022 · d7bb081 · d7bb081
1 parent 32af9b8
commit d7bb081
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/UI/MainWindow/MainWindowMenuHandler.cs b/UI/MainWindow/MainWindowMenuHandler.cs
@@ -223,7 +223,9 @@ private void Menu_Help(object sender, RoutedEventArgs e)
         private void Menu_OpenSPDef(object sender, RoutedEventArgs e)
         {
             var spDefinitionWindow = new SPDefinitionWindow { Owner = this, ShowInTaskbar = false };
+            DimmMainWindow();
             spDefinitionWindow.ShowDialog();
+            RestoreMainWindow();
         }
 
         private void Menu_OpenOptions(object sender, RoutedEventArgs e)

diff --git a/UI/Windows/ConfigWindow.xaml b/UI/Windows/ConfigWindow.xaml
@@ -12,7 +12,8 @@
                       Title="Configurations"
                       TitleCaps="False"
                       ShowTitleBar="true" 
-                      Closing="MetroWindow_Closing">
+                      Closing="MetroWindow_Closing"
+                      KeyDown="MetroWindow_KeyDown">
 
   <controls:MetroWindow.Resources>
     <ResourceDictionary>

diff --git a/UI/Windows/ConfigWindow.xaml.cs b/UI/Windows/ConfigWindow.xaml.cs
@@ -778,6 +778,14 @@ private void SidebarColumn_SizeChanged(object sender, SizeChangedEventArgs e)
                 DeleteButtonText.Visibility = Visibility.Visible;
             }
         }
+
+        private void MetroWindow_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                Close();
+            }
+        }
         #endregion
 
         #region Methods

diff --git a/UI/Windows/SPDefinitionWindow.xaml b/UI/Windows/SPDefinitionWindow.xaml
@@ -8,7 +8,8 @@
                       WindowStartupLocation="CenterOwner" 
                       GlowBrush="{DynamicResource AccentColorBrush}"
                       ShowTitleBar="True"
-                      TitleCharacterCasing="Normal">
+                      TitleCharacterCasing="Normal"
+                      KeyDown="MetroWindow_KeyDown">
 
   <controls:MetroWindow.Resources>
     <ResourceDictionary>

diff --git a/UI/Windows/SPDefinitionWindow.xaml.cs b/UI/Windows/SPDefinitionWindow.xaml.cs
@@ -255,6 +255,14 @@ private void SPFunctionsListBox_KeyDown(object sender, KeyEventArgs e)
             }
         }
 
+        private void MetroWindow_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                Close();
+            }
+        }
+
         private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             SPProgress.IsIndeterminate = true;