Change interface style

Author: Jack251970

Flow.Launcher.Infrastructure/QuickSwitch/Models/WindowsDialog.cs

@@ -15,37 +15,27 @@ namespace Flow.Launcher.Infrastructure.QuickSwitch.Models
     /// </summary>
     public class WindowsDialog : IQuickSwitchDialog
     {
-        public IQuickSwitchDialogWindow DialogWindow { get; private set; }
-
         private const string WindowsDialogClassName = "#32770";
 
-        public bool CheckDialogWindow(IntPtr hwnd)
+        public IQuickSwitchDialogWindow CheckDialogWindow(IntPtr hwnd)
         {
-            // Has it been checked?
-            if (DialogWindow != null && DialogWindow.Handle == hwnd)
-            {
-                return true;
-            }
-
             // Is it a Win32 dialog box?
             if (GetClassName(new(hwnd)) == WindowsDialogClassName)
             {
                 // Is it a windows file dialog?
                 var dialogType = GetFileDialogType(new(hwnd));
                 if (dialogType != DialogType.Others)
                 {
-                    DialogWindow = new WindowsDialogWindow(hwnd, dialogType);
-
-                    return true;
+                    return new WindowsDialogWindow(hwnd, dialogType);
                 }
             }
-            return false;
+
+            return null;
         }
 
         public void Dispose()
         {
-            DialogWindow?.Dispose();
-            DialogWindow = null;
+
         }
 
         #region Help Methods
@@ -101,7 +91,7 @@ public IQuickSwitchDialogWindowTab GetCurrentTab()
 
         public void Dispose()
         {
-            Handle = HWND.Null;
+
         }
     }
 
@@ -219,7 +209,7 @@ public bool Open()
 
         public void Dispose()
         {
-            Handle = HWND.Null;
+            
         }
 
         #endregion

Flow.Launcher.Infrastructure/QuickSwitch/QuickSwitch.cs

@@ -48,9 +48,9 @@ public static class QuickSwitch
         private static IQuickSwitchExplorer _lastExplorer = null;
         private static readonly object _lastExplorerLock = new();
 
-        private static readonly List<IQuickSwitchDialog> _quickSwitchDialogs = new()
+        private static readonly Dictionary<IQuickSwitchDialog, IQuickSwitchDialogWindow> _quickSwitchDialogs = new()
         {
-            new WindowsDialog()
+            { new WindowsDialog(), null }
         };
 
         private static IQuickSwitchDialogWindow _dialogWindow = null;
@@ -179,6 +179,12 @@ public static void SetupQuickSwitch(bool enabled)
                     _quickSwitchExplorers[explorer] = null;
                 }
 
+                // Remove dialog windows
+                foreach (var dialog in _quickSwitchDialogs.Keys)
+                {
+                    _quickSwitchDialogs[dialog] = null;
+                }
+
                 // Remove dialog window handle
                 var dialogWindowExists = false;
                 lock (_dialogWindowLock)
@@ -402,14 +408,27 @@ uint dwmsEventTime
                 // Check if it is a file dialog window
                 var isDialogWindow = false;
                 var dialogWindowChanged = false;
-                foreach (var dialog in _quickSwitchDialogs)
+                foreach (var dialog in _quickSwitchDialogs.Keys)
                 {
-                    if (dialog.CheckDialogWindow(hwnd))
+                    IQuickSwitchDialogWindow dialogWindow;
+                    var existingDialogWindow = _quickSwitchDialogs[dialog];
+                    if (existingDialogWindow != null && existingDialogWindow.Handle == hwnd)
+                    {
+                        // If the dialog window is already in the list, no need to check again
+                        dialogWindow = existingDialogWindow;
+                    }
+                    else
+                    {
+                        dialogWindow = dialog.CheckDialogWindow(hwnd);
+                    }
+
+                    // If the dialog window is found, set it
+                    if (dialogWindow != null)
                     {
                         lock (_dialogWindowLock)
                         {
                             dialogWindowChanged = _dialogWindow == null || _dialogWindow.Handle != hwnd;
-                            _dialogWindow = dialog.DialogWindow;
+                            _dialogWindow = dialogWindow;
                         }
 
                         isDialogWindow = true;
@@ -667,21 +686,30 @@ private static IQuickSwitchDialogWindow GetDialogWindow(HWND hwnd)
             }
 
             // Then check all dialog windows
-            foreach (var dialog in _quickSwitchDialogs)
+            foreach (var dialogWindow in _quickSwitchDialogs.Values)
             {
-                if (dialog.DialogWindow.Handle == hwnd)
+                if (dialogWindow.Handle == hwnd)
                 {
-                    return dialog.DialogWindow;
+                    return dialogWindow;
                 }
             }
 
-            // Finally search for the dialog window
-            foreach (var dialog in _quickSwitchDialogs)
+            // Finally search for the dialog window again
+            foreach (var dialog in _quickSwitchDialogs.Keys)
             {
-                if (dialog.CheckDialogWindow(hwnd))
+                IQuickSwitchDialogWindow dialogWindow;
+                var existingDialogWindow = _quickSwitchDialogs[dialog];
+                if (existingDialogWindow != null && existingDialogWindow.Handle == hwnd)
                 {
-                    return dialog.DialogWindow;
+                    // If the dialog window is already in the list, no need to check again
+                    dialogWindow = existingDialogWindow;
                 }
+                else
+                {
+                    dialogWindow = dialog.CheckDialogWindow(hwnd);
+                }
+
+                return dialogWindow;
             }
 
             return null;
@@ -820,8 +848,9 @@ public static void Dispose()
             }
 
             // Dispose dialogs
-            foreach (var dialog in _quickSwitchDialogs)
+            foreach (var dialog in _quickSwitchDialogs.Keys)
             {
+                _quickSwitchDialogs[dialog]?.Dispose();
                 dialog.Dispose();
             }
             _quickSwitchDialogs.Clear();

Flow.Launcher.Plugin/Interfaces/IQuickSwitchDialog.cs

@@ -10,11 +10,15 @@ namespace Flow.Launcher.Plugins
     public interface IQuickSwitchDialog : IDisposable
     {
         /// <summary>
-        /// 
+        /// Check if the foreground window is a file dialog instance.
         /// </summary>
-        IQuickSwitchDialogWindow DialogWindow { get; }
-
-        bool CheckDialogWindow(IntPtr hwnd);
+        /// <param name="hwnd">
+        /// The handle of the foreground window to check.
+        /// </param>
+        /// <returns>
+        /// The window if the foreground window is a file dialog instance. Null if it is not.
+        /// </returns>
+        IQuickSwitchDialogWindow? CheckDialogWindow(IntPtr hwnd);
     }
 
     public interface IQuickSwitchDialogWindow : IDisposable