Use quick switch pair models

Author: Jack251970

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -9,6 +9,7 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Infrastructure;
+using Flow.Launcher.Infrastructure.QuickSwitch;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
@@ -27,6 +28,9 @@ public static class PluginManager
         private static IEnumerable<PluginPair> _contextMenuPlugins;
         private static IEnumerable<PluginPair> _homePlugins;
 
+        private static readonly List<QuickSwitchExplorerPair> _quickSwitchExplorerPlugins = new();
+        private static readonly List<QuickSwitchDialogPair> _quickSwitchDialogPlugins = new();
+
         public static List<PluginPair> AllPlugins { get; private set; }
         public static readonly HashSet<PluginPair> GlobalPlugins = new();
         public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new();
@@ -251,6 +255,23 @@ public static async Task InitializePluginsAsync()
             _contextMenuPlugins = GetPluginsForInterface<IContextMenu>();
             _homePlugins = GetPluginsForInterface<IAsyncHomeQuery>();
 
+            foreach (var pair in GetPluginsForInterface<IQuickSwitchExplorer>())
+            {
+                _quickSwitchExplorerPlugins.Add(new QuickSwitchExplorerPair
+                {
+                    Plugin = (IQuickSwitchExplorer)pair.Plugin,
+                    Metadata = pair.Metadata
+                });
+            }
+            foreach (var pair in GetPluginsForInterface<IQuickSwitchDialog>())
+            {
+                _quickSwitchDialogPlugins.Add(new QuickSwitchDialogPair
+                {
+                    Plugin = (IQuickSwitchDialog)pair.Plugin,
+                    Metadata = pair.Metadata
+                });
+            }
+
             foreach (var plugin in AllPlugins)
             {
                 // set distinct on each plugin's action keywords helps only firing global(*) and action keywords once where a plugin
@@ -475,6 +496,16 @@ public static bool IsHomePlugin(string id)
             return _homePlugins.Any(p => p.Metadata.ID == id);
         }
 
+        public static IList<QuickSwitchExplorerPair> GetQuickSwitchExplorers()
+        {
+            return _quickSwitchExplorerPlugins;
+        }
+
+        public static IList<QuickSwitchDialogPair> GetQuickSwitchDialogs()
+        {
+            return _quickSwitchDialogPlugins;
+        }
+
         public static bool ActionKeywordRegistered(string actionKeyword)
         {
             // this method is only checking for action keywords (defined as not '*') registration

Flow.Launcher.Infrastructure/QuickSwitch/QuickSwitch.cs

@@ -30,6 +30,26 @@ public static class QuickSwitch
 
         public static QuickSwitchWindowPositions QuickSwitchWindowPosition { get; private set; }
 
+        public static QuickSwitchExplorerPair WindowsQuickSwitchExplorer { get; } = new()
+        {
+            Metadata = new()
+            {
+                ID = "298b197c08a24e90ab66ac060ee2b6b8", // ID is for calculating the hash id of the quick switch pairs
+                Disabled = false // Disabled is for enabling the Windows QuickSwitch explorers & dialogs
+            },
+            Plugin = new WindowsExplorer()
+        };
+
+        public static QuickSwitchDialogPair WindowsQuickSwitchDialog { get; } = new()
+        {
+            Metadata = new()
+            {
+                ID = "a4a113dc51094077ab4abb391e866c7b", // ID is for calculating the hash id of the quick switch pairs
+                Disabled = false // Disabled is for enabling the Windows QuickSwitch explorers & dialogs
+            },
+            Plugin = new WindowsDialog()
+        };
+
         #endregion
 
         #region Private Fields
@@ -40,18 +60,12 @@ public static class QuickSwitch
 
         private static HWND _mainWindowHandle = HWND.Null;
 
-        private static readonly Dictionary<IQuickSwitchExplorer, IQuickSwitchExplorerWindow> _quickSwitchExplorers = new()
-        {
-            { new WindowsExplorer(), null }
-        };
+        private static readonly Dictionary<QuickSwitchExplorerPair, IQuickSwitchExplorerWindow> _quickSwitchExplorers = new();
 
-        private static IQuickSwitchExplorer _lastExplorer = null;
+        private static QuickSwitchExplorerPair _lastExplorer = null;
         private static readonly object _lastExplorerLock = new();
 
-        private static readonly Dictionary<IQuickSwitchDialog, IQuickSwitchDialogWindow> _quickSwitchDialogs = new()
-        {
-            { new WindowsDialog(), null }
-        };
+        private static readonly Dictionary<QuickSwitchDialogPair, IQuickSwitchDialogWindow> _quickSwitchDialogs = new();
 
         private static IQuickSwitchDialogWindow _dialogWindow = null;
         private static readonly object _dialogWindowLock = new();
@@ -83,10 +97,23 @@ public static class QuickSwitch
 
         #region Initialize & Setup
 
-        public static void InitializeQuickSwitch()
+        public static void InitializeQuickSwitch(IList<QuickSwitchExplorerPair> quickSwitchExplorers,
+            IList<QuickSwitchDialogPair> quickSwitchDialogs)
         {
             if (_initialized) return;
 
+            // Initialize quick switch explorers & dialogs
+            _quickSwitchExplorers.Add(WindowsQuickSwitchExplorer, null);
+            foreach (var explorer in quickSwitchExplorers)
+            {
+                _quickSwitchExplorers.Add(explorer, null);
+            }
+            _quickSwitchDialogs.Add(WindowsQuickSwitchDialog, null);
+            foreach (var dialog in quickSwitchDialogs)
+            {
+                _quickSwitchDialogs.Add(dialog, null);
+            }
+
             // Initialize main window handle
             _mainWindowHandle = Win32Helper.GetMainWindowHandle();
 
@@ -242,7 +269,9 @@ private static bool RefreshLastExplorer()
                 {
                     foreach (var explorer in _quickSwitchExplorers.Keys)
                     {
-                        var explorerWindow = explorer.CheckExplorerWindow(hWnd);
+                        if (explorer.Metadata.Disabled) continue;
+
+                        var explorerWindow = explorer.Plugin.CheckExplorerWindow(hWnd);
                         if (explorerWindow != null)
                         {
                             _quickSwitchExplorers[explorer] = explorerWindow;
@@ -407,6 +436,8 @@ uint dwmsEventTime
                 var dialogWindowChanged = false;
                 foreach (var dialog in _quickSwitchDialogs.Keys)
                 {
+                    if (dialog.Metadata.Disabled) continue;
+
                     IQuickSwitchDialogWindow dialogWindow;
                     var existingDialogWindow = _quickSwitchDialogs[dialog];
                     if (existingDialogWindow != null && existingDialogWindow.Handle == hwnd)
@@ -416,7 +447,7 @@ uint dwmsEventTime
                     }
                     else
                     {
-                        dialogWindow = dialog.CheckDialogWindow(hwnd);
+                        dialogWindow = dialog.Plugin.CheckDialogWindow(hwnd);
                     }
 
                     // If the dialog window is found, set it
@@ -496,7 +527,9 @@ uint dwmsEventTime
                         {
                             foreach (var explorer in _quickSwitchExplorers.Keys)
                             {
-                                var explorerWindow = explorer.CheckExplorerWindow(hwnd);
+                                if (explorer.Metadata.Disabled) continue;
+
+                                var explorerWindow = explorer.Plugin.CheckExplorerWindow(hwnd);
                                 if (explorerWindow != null)
                                 {
                                     Log.Debug(ClassName, $"Explorer window: {hwnd}");
@@ -693,6 +726,8 @@ private static IQuickSwitchDialogWindow GetDialogWindow(HWND hwnd)
             // Finally search for the dialog window again
             foreach (var dialog in _quickSwitchDialogs.Keys)
             {
+                if (dialog.Metadata.Disabled) continue;
+
                 IQuickSwitchDialogWindow dialogWindow;
                 var existingDialogWindow = _quickSwitchDialogs[dialog];
                 if (existingDialogWindow != null && existingDialogWindow.Handle == hwnd)
@@ -702,7 +737,7 @@ private static IQuickSwitchDialogWindow GetDialogWindow(HWND hwnd)
                 }
                 else
                 {
-                    dialogWindow = dialog.CheckDialogWindow(hwnd);
+                    dialogWindow = dialog.Plugin.CheckDialogWindow(hwnd);
                 }
 
                 return dialogWindow;
@@ -835,7 +870,6 @@ public static void Dispose()
             foreach (var explorer in _quickSwitchExplorers.Keys)
             {
                 _quickSwitchExplorers[explorer]?.Dispose();
-                explorer.Dispose();
             }
             _quickSwitchExplorers.Clear();
             lock (_lastExplorerLock)
@@ -847,7 +881,6 @@ public static void Dispose()
             foreach (var dialog in _quickSwitchDialogs.Keys)
             {
                 _quickSwitchDialogs[dialog]?.Dispose();
-                dialog.Dispose();
             }
             _quickSwitchDialogs.Clear();
             lock (_dialogWindowLock)

Flow.Launcher/App.xaml.cs

@@ -228,7 +228,7 @@ await API.StopwatchLogInfoAsync(ClassName, "Startup cost", async () =>
                 // Initialize theme for main window
                 Ioc.Default.GetRequiredService<Theme>().ChangeTheme();
 
-                QuickSwitch.InitializeQuickSwitch();
+                QuickSwitch.InitializeQuickSwitch(PluginManager.GetQuickSwitchExplorers(), PluginManager.GetQuickSwitchDialogs());
                 QuickSwitch.SetupQuickSwitch(_settings.EnableQuickSwitch);
 
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);