Restore to original visibility status & Improve code quality

Author: Jack251970

Flow.Launcher.Infrastructure/QuickSwitch/QuickSwitch.cs

@@ -22,7 +22,7 @@ public static class QuickSwitch
 
         public static Action UpdateQuickSwitchWindow { get; set; } = null;
 
-        public static Action DestoryQuickSwitchWindow { get; set; } = null;
+        public static Action ResetQuickSwitchWindow { get; set; } = null;
 
         // The class name of a dialog window
         private const string DialogWindowClassName = "#32770";
@@ -209,13 +209,12 @@ uint dwmsEventTime
             // If window is dialog window, show quick switch window and navigate path if needed
             if (GetWindowClassName(hwnd) == DialogWindowClassName)
             {
-                if (_settings.ShowQuickSwitchWindow)
-                {
-                    _dialogWindowHandle = hwnd;
-                    ShowQuickSwitchWindow?.Invoke(_dialogWindowHandle.Value);
-                }
+                _dialogWindowHandle = hwnd;
+                ShowQuickSwitchWindow?.Invoke(_dialogWindowHandle.Value);
                 if (_settings.AutoQuickSwitch)
                 {
+                    // Showing quick switch window may bring focus
+                    Win32Helper.SetForegroundWindow(hwnd);
                     NavigateDialogPath();
                 }
             }
@@ -278,7 +277,7 @@ uint dwmsEventTime
             if (_dialogWindowHandle != HWND.Null && _dialogWindowHandle == hwnd)
             {
                 _dialogWindowHandle = HWND.Null;
-                DestoryQuickSwitchWindow?.Invoke();
+                ResetQuickSwitchWindow?.Invoke();
             }
         }
 

Flow.Launcher/MainWindow.xaml.cs

@@ -1162,7 +1162,7 @@ private void InitializeQuickSwitch()
         {
             QuickSwitch.ShowQuickSwitchWindow = _viewModel.SetupQuickSwitch;
             QuickSwitch.UpdateQuickSwitchWindow = UpdateQuickSwitchPosition;
-            QuickSwitch.DestoryQuickSwitchWindow = _viewModel.ResetQuickSwitch;
+            QuickSwitch.ResetQuickSwitchWindow = _viewModel.ResetQuickSwitch;
         }
 
 #pragma warning disable VSTHRD100 // Avoid async void methods

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -1515,9 +1515,15 @@ public bool ShouldIgnoreHotkeys()
 
         public bool IsQuickSwitch { get; private set; }
         public nint DialogWindowHandle { get; private set; } = nint.Zero;
+        
+        private bool PreviousMainWindowVisibilityStatus { get; set; } = true;
 
         public void SetupQuickSwitch(nint handle)
         {
+            if (!Settings.ShowQuickSwitchWindow) return;
+
+            PreviousMainWindowVisibilityStatus = MainWindowVisibilityStatus;
+
             DialogWindowHandle = handle;
             IsQuickSwitch = true;
             Show();
@@ -1527,7 +1533,15 @@ public void ResetQuickSwitch()
         {
             DialogWindowHandle = nint.Zero;
             IsQuickSwitch = false;
-            Hide();
+
+            if (PreviousMainWindowVisibilityStatus)
+            {
+                Show();
+            }
+            else
+            {
+                Hide();
+            }
         }
 
         #endregion