Remove Uncessary Window.Activate()

Author: lzl1918

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

@@ -302,7 +302,6 @@ private void OnWinRPressed()
             // show the main window and set focus to the query box
             Window mainWindow = Application.Current.MainWindow;
             mainWindow.Visibility = Visibility.Visible;
-            mainWindow.Activate();
             mainWindow.Focus();
         }