-

README.md

@@ -201,6 +201,8 @@ mpv.net bugs and requests: <https://github.com/stax76/mpv.net/issues>
 
 - dark mode support was added to the command palette
 - a new icon was designed. [Website](https://mpv-net.github.io/mpv.net-web-site/)
+- all windows (main, conf, input, about, command palette) can now be closed
+  by just pressing the Escape key
 
 ### 3.2 (2019-04-27)
 

mpv.net/Windows/AboutWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         Title="About mpv.net" Height="230" Width="420" FontSize="16" ShowInTaskbar="False"
-        WindowStartupLocation="CenterOwner" ResizeMode="NoResize" PreviewKeyDown="Window_PreviewKeyDown">
+        WindowStartupLocation="CenterOwner" ResizeMode="NoResize">
     <Grid>
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
             <TextBlock FontSize="48" HorizontalAlignment="Center" Margin="0,0,0,10">mpv.net</TextBlock>

mpv.net/Windows/AboutWindow.xaml.cs

@@ -12,9 +12,7 @@ namespace mpvnet
             Foreground = WPF.WPF.ThemeBrush;
         }
 
-        private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
-        {
-            Close();
-        }
+        protected override void OnPreviewKeyDown(KeyEventArgs e) => Close();
+        protected override void OnMouseDown(MouseButtonEventArgs e) => Close();
     }
 }

mpv.net/Windows/ConfWindow.xaml.cs

@@ -240,5 +240,12 @@ namespace mpvnet
         {
             Process.Start("https://github.com/stax76/mpv.net#Support");
         }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (e.Key == Key.Escape)
+                Close();
+        }
     }
 }

mpv.net/Windows/InputWindow.xaml.cs

@@ -122,5 +122,12 @@ namespace mpvnet
                 if (MessageBox.Show($"Confirm to delete: {(grid.SelectedItem as CommandItem).Input} ({(grid.SelectedItem as CommandItem).Path})", "Confirm Delete", MessageBoxButton.OKCancel, MessageBoxImage.Question) != MessageBoxResult.OK)
                     e.Handled = true;
         }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (e.Key == Key.Escape)
+                Close();
+        }
     }
 }