Merge pull request #489 from lzl1918/lzl1918/FixShellPluginDoesNotAutoFocus

[Plugin.Shell] Fix: The Query Box Is Not Focused When HotKey Invoked

Author: taooceros

Flow.Launcher/CustomQueryHotkeySetting.xaml.cs

@@ -55,7 +55,7 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
                 SetHotkey(ctlHotkey.CurrentHotkey, delegate
                 {
                     App.API.ChangeQuery(pluginHotkey.ActionKeyword);
-                    Application.Current.MainWindow.Visibility = Visibility.Visible;
+                    ShowMainWindow();
                 });
             }
             else
@@ -73,11 +73,18 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
                 SetHotkey(new HotkeyModel(updateCustomHotkey.Hotkey), delegate
                 {
                     App.API.ChangeQuery(updateCustomHotkey.ActionKeyword);
-                    Application.Current.MainWindow.Visibility = Visibility.Visible;
+                    ShowMainWindow();
                 });
             }
 
             Close();
+
+            static void ShowMainWindow()
+            {
+                Window mainWindow = Application.Current.MainWindow;
+                mainWindow.Visibility = Visibility.Visible;
+                mainWindow.Focus();
+            }
         }
 
         public void UpdateItem(CustomPluginHotkey item)

Plugins/Flow.Launcher.Plugin.Shell/Main.cs

@@ -298,7 +298,11 @@ bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
         private void OnWinRPressed()
         {
             context.API.ChangeQuery($"{context.CurrentPluginMetadata.ActionKeywords[0]}{Plugin.Query.TermSeperater}");
-            Application.Current.MainWindow.Visibility = Visibility.Visible;
+
+            // show the main window and set focus to the query box
+            Window mainWindow = Application.Current.MainWindow;
+            mainWindow.Visibility = Visibility.Visible;
+            mainWindow.Focus();
         }
 
         public Control CreateSettingPanel()