Add IQuickSwitchExplorerWindow interface

Author: Jack251970

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

@@ -19,8 +19,6 @@ internal class WindowsDialog : IQuickSwitchDialog
 
         private const string WindowsDialogClassName = "#32770";
 
-        public string Name => "Windows";
-
         public bool CheckDialogWindow(IntPtr hwnd)
         {
             // Has it been checked?

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

@@ -12,10 +12,9 @@ namespace Flow.Launcher.Infrastructure.QuickSwitch.Models
     /// </summary>
     public class WindowsExplorer : IQuickSwitchExplorer
     {
-        private static readonly string ClassName = nameof(WindowsExplorer);
+        public IQuickSwitchExplorerWindow ExplorerWindow { get; private set; }
 
-        private static IWebBrowser2 _lastExplorerView = null;
-        private static readonly object _lastExplorerViewLock = new();
+        private static readonly string ClassName = nameof(WindowsExplorer);
 
         public bool CheckExplorerWindow(IntPtr foreground)
         {
@@ -32,10 +31,7 @@ public bool CheckExplorerWindow(IntPtr foreground)
 
                         if (explorer.HWND != foreground) return true;
 
-                        lock (_lastExplorerViewLock)
-                        {
-                            _lastExplorerView = explorer;
-                        }
+                        ExplorerWindow = new WindowsExplorerWindow(foreground, explorer);
                         isExplorer = true;
                         return false;
                     }
@@ -78,6 +74,50 @@ private static unsafe void EnumerateShellWindows(Func<object, bool> action)
             }
         }
 
+        public void RemoveExplorerWindow()
+        {
+            ExplorerWindow = null;
+        }
+
+        public void Dispose()
+        {
+            ExplorerWindow?.Dispose();
+        }
+    }
+
+    public class WindowsExplorerWindow : IQuickSwitchExplorerWindow
+    {
+        public IntPtr Handle { get; }
+
+        private static readonly object _lastExplorerViewLock = new();
+        private static IWebBrowser2 _lastExplorerView = null;
+
+        internal WindowsExplorerWindow(IntPtr handle, IWebBrowser2 explorerView)
+        {
+            Handle = handle;
+            _lastExplorerView = explorerView;
+        }
+
+        public void Dispose()
+        {
+            // Release ComObjects
+            try
+            {
+                lock (_lastExplorerViewLock)
+                {
+                    if (_lastExplorerView != null)
+                    {
+                        Marshal.ReleaseComObject(_lastExplorerView);
+                        _lastExplorerView = null;
+                    }
+                }
+            }
+            catch (COMException)
+            {
+                _lastExplorerView = null;
+            }
+        }
+
         public string GetExplorerPath()
         {
             if (_lastExplorerView == null) return null;
@@ -134,33 +174,5 @@ public string GetExplorerPath()
 
             return path;
         }
-
-        public void RemoveExplorerWindow()
-        {
-            lock (_lastExplorerViewLock)
-            {
-                _lastExplorerView = null;
-            }
-        }
-
-        public void Dispose()
-        {
-            // Release ComObjects
-            try
-            {
-                lock (_lastExplorerViewLock)
-                {
-                    if (_lastExplorerView != null)
-                    {
-                        Marshal.ReleaseComObject(_lastExplorerView);
-                        _lastExplorerView = null;
-                    }
-                }
-            }
-            catch (COMException)
-            {
-                _lastExplorerView = null;
-            }
-        }
     }
 }

Flow.Launcher.Infrastructure/QuickSwitch/QuickSwitch.cs

@@ -259,7 +259,7 @@ private static bool RefreshLastExplorer()
 
         public static string GetActiveExplorerPath()
         {
-            return RefreshLastExplorer() ? _lastExplorer.GetExplorerPath() : string.Empty;
+            return RefreshLastExplorer() ? _lastExplorer.ExplorerWindow?.GetExplorerPath() : string.Empty;
         }
 
         #endregion
@@ -610,7 +610,7 @@ private static async Task<bool> NavigateDialogPathAsync(HWND hwnd, bool auto = f
             string path;
             lock (_lastExplorerLock)
             {
-                path = _lastExplorer?.GetExplorerPath();
+                path = _lastExplorer?.ExplorerWindow?.GetExplorerPath();
             }
             if (string.IsNullOrEmpty(path)) return false;
 

Flow.Launcher.Plugin/Interfaces/IQuickSwitchExplorer.cs

@@ -7,6 +7,8 @@ namespace Flow.Launcher.Plugins
     /// </summary>
     public interface IQuickSwitchExplorer : IDisposable
     {
+        IQuickSwitchExplorerWindow ExplorerWindow { get; }
+
         /// <summary>
         /// Check if the foreground window is a Windows Explorer instance.
         /// </summary>
@@ -22,11 +24,12 @@ public interface IQuickSwitchExplorer : IDisposable
         /// 
         /// </summary>
         void RemoveExplorerWindow();
+    }
+
+    public interface IQuickSwitchExplorerWindow : IDisposable
+    {
+        IntPtr Handle { get; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
         string GetExplorerPath();
     }
 }