Improve auto quick switch

Author: Jack251970

Flow.Launcher.Infrastructure/QuickSwitch/QuickSwitch.cs

@@ -150,7 +150,7 @@ public static void OnToggleHotkey(object sender, HotkeyEventArgs args)
             }
         }
 
-        private static void NavigateDialogPath()
+        private static void NavigateDialogPath(Action action = null)
         {
             object document = null;
             try
@@ -199,10 +199,10 @@ private static void NavigateDialogPath()
                 return;
             }
 
-            JumpToPath(path);
+            JumpToPath(path, action);
         }
 
-        public static bool JumpToPath(string path)
+        public static bool JumpToPath(string path, Action action = null)
         {
             if (!CheckPath(path, out var isFile)) return false;
 
@@ -225,6 +225,9 @@ public static bool JumpToPath(string path)
                 {
                     Win32Helper.DirJump(path, Win32Helper.GetForegroundWindow());
                 }
+
+                // Invoke action if provided
+                action?.Invoke();
             });
             t.Start();
             return true;
@@ -272,30 +275,38 @@ private static void ForegroundChangeCallback(
             uint dwmsEventTime
         )
         {
-            // File dialog window is foreground
+            // File dialog window
             if (GetWindowClassName(hwnd) == DialogWindowClassName)
             {
                 lock (_dialogWindowHandleLock)
                 {
                     _dialogWindowHandle = hwnd;
                 }
 
+                // Navigate to path
+                if (_settings.AutoQuickSwitch)
+                {
+                    Win32Helper.SetForegroundWindow(hwnd);
+                    NavigateDialogPath(() =>
+                    {
+                        // Show quick switch window after path is navigated
+                        if (_settings.ShowQuickSwitchWindow)
+                        {
+                            ShowQuickSwitchWindow?.Invoke(_dialogWindowHandle.Value);
+                            _dragMoveTimer?.Start();
+                        }
+                    });
+                    return;
+                }
+
                 // Show quick switch window
                 if (_settings.ShowQuickSwitchWindow)
                 {
                     ShowQuickSwitchWindow?.Invoke(_dialogWindowHandle.Value);
                     _dragMoveTimer?.Start();
                 }
-
-                // Navigate path if needed
-                if (_settings.AutoQuickSwitch)
-                {
-                    // Showing quick switch window may bring focus
-                    Win32Helper.SetForegroundWindow(hwnd);
-                    NavigateDialogPath();
-                }
             }
-            // Quick switch window is foreground
+            // Quick switch window
             else if (hwnd == _mainWindowHandle)
             {
                 // Nothing to do