Fix touch shortcut ESC

Valkirie · Aug 25, 2022 · 1348d0b · 1348d0b
1 parent afe52f8
commit 1348d0b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/HandheldCompanion/Views/Windows/QuickTools.xaml.cs b/HandheldCompanion/Views/Windows/QuickTools.xaml.cs
@@ -127,6 +127,8 @@ private void navView_ItemInvoked(NavigationView sender, NavigationViewItemInvoke
                 NavigationViewItem navItem = (NavigationViewItem)args.InvokedItemContainer;
                 string navItemTag = (string)navItem.Tag;
 
+                var foregroundProcess = MainWindow.processManager.GetForegroundProcess();
+
                 switch (navItemTag)
                 {
                     default:
@@ -139,14 +141,16 @@ private void navView_ItemInvoked(NavigationView sender, NavigationViewItemInvoke
                         MainWindow.inputsManager.KeyPress(new VirtualKeyCode[] { VirtualKeyCode.LWIN, VirtualKeyCode.VK_D });
                         break;
                     case "shortcutESC":
-                        MainWindow.inputsManager.KeyPress(VirtualKeyCode.ESCAPE);
+                        if (foregroundProcess != null)
+                        {
+                            SetForegroundWindow(foregroundProcess.MainWindowHandle);
+                            MainWindow.inputsManager.KeyPress(VirtualKeyCode.ESCAPE);
+                        }
                         break;
                     case "shortcutExpand":
-                        var foregroundProcess = MainWindow.processManager.GetForegroundProcess();
                         if (foregroundProcess != null)
                         {
                             SetForegroundWindow(foregroundProcess.MainWindowHandle);
-                            ShowWindow(foregroundProcess.MainWindowHandle, SW_SHOWMAXIMIZED);
                             MainWindow.inputsManager.KeyStroke(VirtualKeyCode.LMENU, VirtualKeyCode.RETURN);
                         }
                         break;