Merge pull request #37 from merken/master

Implemented SearchWindowsAcrossAllVDesktop
taooceros · Oct 15, 2022 · b119192 · b119192
2 parents dc13d12 + d4d2dbf
commit b119192
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/Components/OpenWindows.cs b/Components/OpenWindows.cs
@@ -40,6 +40,8 @@ public List<Window> Windows
         /// </summary>
         public static OpenWindows Instance => instance ??= new OpenWindows();
 
+        public bool SearchWindowsAcrossAllVDesktop = false;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="OpenWindows"/> class.
         /// Private constructor to make sure there is never
@@ -74,14 +76,14 @@ public bool WindowEnumerationCallBack(IntPtr hwnd, IntPtr lParam)
 
             if (newWindow.IsWindow && newWindow.Visible && newWindow.IsOwner
                 && (!newWindow.IsToolWindow || newWindow.IsAppWindow) && !newWindow.TaskListDeleted
-                && (newWindow.Desktop.IsVisible || Main.VirtualDesktopHelperInstance.GetDesktopCount() < 2)
+                && (SearchWindowsAcrossAllVDesktop || (newWindow.Desktop.IsVisible || Main.VirtualDesktopHelperInstance.GetDesktopCount() < 2))
                 && newWindow.ClassName != "Windows.UI.Core.CoreWindow"
                 && newWindow.Process.Name != flowLauncherExe
                 && (!newWindow.IsCloaked ||
                     newWindow.GetWindowCloakState() ==
-                    Window.WindowCloakState.OtherDesktop) 
-                // To hide (not add) preloaded uwp app windows that are invisible to the user and other cloaked windows,
-                // we check the cloak state.
+                    Window.WindowCloakState.OtherDesktop)
+               // To hide (not add) preloaded uwp app windows that are invisible to the user and other cloaked windows,
+               // we check the cloak state.
                )
             {
                 windows.Add(newWindow);

diff --git a/Components/SearchController.cs b/Components/SearchController.cs
@@ -34,9 +34,10 @@ public static string SearchText
         /// <summary>
         /// Event handler for when the search text has been updated
         /// </summary>
-        public static List<SearchResult> GetResult(string searchText)
+        public static List<SearchResult> GetResult(string searchText, bool searchWindowsAcrossAllVDesktop)
         {
             SearchText = searchText;
+            OpenWindows.Instance.SearchWindowsAcrossAllVDesktop = searchWindowsAcrossAllVDesktop;
             return OpenWindowsWithModel();
         }
 

diff --git a/Main.cs b/Main.cs
@@ -71,7 +71,7 @@ public List<Result> Query(Query query)
             VirtualDesktopHelperInstance.UpdateDesktopList();
             OpenWindows.Instance.UpdateOpenWindowsList();
 
-            var searchResults = SearchController.GetResult(query.Search);
+            var searchResults = SearchController.GetResult(query.Search, Settings.SearchWindowsAcrossAllVDesktop);
 
             var results = searchResults.Where(x => !string.IsNullOrEmpty(x.Result.Title))
                 .Select(x => new Result()

diff --git a/plugin.json b/plugin.json
@@ -4,7 +4,7 @@
     "Name":"Window Walker",
     "Description":"Alt-Tab alternative enabling searching through your windows.",
     "Author":"betadele",
-    "Version":"2.2.1",
+    "Version":"2.2.2",
     "Language":"csharp",
     "Website":"https://www.windowwalker.com/",
     "ExecuteFileName":"Flow.Plugin.WindowWalker.dll",