Added fix for closing wox on pressing escape and app execution (micro…

…soft#75)
ryanbodrug-microsoft · Apr 8, 2020 · 9d1b8fb · 9d1b8fb
1 parent 0648ecf
commit 9d1b8fb
Show file tree

Hide file tree

Showing 2 changed files with 339 additions and 332 deletions.
diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml b/src/modules/launcher/PowerLauncher/MainWindow.xaml
@@ -1,31 +1,34 @@
-<Window x:Class="PowerLauncher.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:wox="clr-namespace:PowerLauncher"
-        xmlns:vm="clr-namespace:Wox.ViewModel;assembly=Wox"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-        mc:Ignorable="d"    
-        xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost"
-        Title="Wox"
-        Topmost="True"
-        SizeToContent="Height"
-        ResizeMode="NoResize"
-        WindowStyle="None"
-        WindowStartupLocation="Manual"
-        AllowDrop="True"
-        ShowInTaskbar="False"
-        Style="{DynamicResource WindowStyle}"
-        Icon="Images/app.png"
-        AllowsTransparency="True"
-        Loaded="OnLoaded"
-        Initialized="OnInitialized"
-        Closing="OnClosing"
-        Drop="OnDrop"
-        LocationChanged="OnLocationChanged"
-        Deactivated="OnDeactivated"
-        PreviewKeyDown="OnKeyDown"
-        Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-        d:DataContext="{d:DesignInstance vm:MainViewModel}">
-    <xaml:WindowsXamlHost InitialTypeName="PowerLauncher.UI.LauncherControl" ChildChanged="WindowsXamlHost_ChildChanged" />
-</Window>
+<Window x:Class="PowerLauncher.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:wox="clr-namespace:PowerLauncher"
+        xmlns:vm="clr-namespace:Wox.ViewModel;assembly=Wox"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+        mc:Ignorable="d"    
+        xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost"
+        Title="Wox"
+        Topmost="True"
+        SizeToContent="Height"
+        ResizeMode="NoResize"
+        WindowStyle="None"
+        WindowStartupLocation="Manual"
+        AllowDrop="True"
+        ShowInTaskbar="False"
+        Style="{DynamicResource WindowStyle}"
+        Icon="Images/app.png"
+        AllowsTransparency="True"
+        Loaded="OnLoaded"
+        Initialized="OnInitialized"
+        Closing="OnClosing"
+        Drop="OnDrop"
+        LocationChanged="OnLocationChanged"
+        Deactivated="OnDeactivated"
+        PreviewKeyDown="OnKeyDown"
+        Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+        d:DataContext="{d:DesignInstance vm:MainViewModel}">
+    <xaml:WindowsXamlHost InitialTypeName="PowerLauncher.UI.LauncherControl" ChildChanged="WindowsXamlHost_ChildChanged" />
+    <Window.InputBindings>
+        <KeyBinding Key="Escape" Command="{Binding EscCommand}"></KeyBinding>
+    </Window.InputBindings>
+</Window>