Create WindowVisibilityHelper for shared logic with SingletonWindowOpener and OpenPluginSettingsWindow

Author: DavidGBrett

Flow.Launcher/Helper/SingletonWindowOpener.cs

@@ -11,30 +11,6 @@ public static T Open<T>(params object[] args) where T : Window
         var window = Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.GetType() == typeof(T))
                      ?? (T)Activator.CreateInstance(typeof(T), args);
 
-        // Fix UI bug
-        // Add `window.WindowState = WindowState.Normal`
-        // If only use `window.Show()`, Settings-window doesn't show when minimized in taskbar 
-        // Not sure why this works tho
-        // Probably because, when `.Show()` fails, `window.WindowState == Minimized` (not `Normal`) 
-        // https://stackoverflow.com/a/59719760/4230390
-        // Ensure the window is not minimized before showing it
-        if (window.WindowState == WindowState.Minimized)
-        {
-            window.WindowState = WindowState.Normal;
-        }
-
-        // Ensure the window is visible
-        if (!window.IsVisible)
-        {
-            window.Show();
-        }
-        else
-        {
-            window.Activate(); // Bring the window to the foreground if already open
-        }
-
-        window.Focus();
-
-        return (T)window;
+        return WindowVisibilityHelper.ShowOrActivate((T)window);
     }
 }

Flow.Launcher/Helper/WindowVisibilityHelper.cs

@@ -0,0 +1,35 @@
+using System.Windows;
+
+namespace Flow.Launcher.Helper;
+
+public static class WindowVisibilityHelper
+{
+    public static T ShowOrActivate<T>(T window) where T : Window
+    {
+        // Fix UI bug
+        // Add `window.WindowState = WindowState.Normal`
+        // If only use `window.Show()`, Settings-window doesn't show when minimized in taskbar 
+        // Not sure why this works tho
+        // Probably because, when `.Show()` fails, `window.WindowState == Minimized` (not `Normal`) 
+        // https://stackoverflow.com/a/59719760/4230390
+        // Ensure the window is not minimized before showing it
+        if (window.WindowState == WindowState.Minimized)
+        {
+            window.WindowState = WindowState.Normal;
+        }
+
+        // Ensure the window is visible
+        if (!window.IsVisible)
+        {
+            window.Show();
+        }
+        else
+        {
+            window.Activate(); // Bring the window to the foreground if already open
+        }
+
+        window.Focus();
+
+        return (T)window;
+    }
+}

Flow.Launcher/PublicAPIInstance.cs

@@ -160,21 +160,7 @@ public bool OpenPluginSettingsWindow(string pluginId)
                         .FirstOrDefault(existing => existing.PluginId == pluginId)
                         ?? new PluginSettingsWindow(pluginId);
 
-                    if (window.WindowState == WindowState.Minimized)
-                    {
-                        window.WindowState = WindowState.Normal;
-                    }
-
-                    if (!window.IsVisible)
-                    {
-                        window.Show();
-                    }
-                    else
-                    {
-                        window.Activate();
-                    }
-
-                    window.Focus();
+                    WindowVisibilityHelper.ShowOrActivate(window);
                     return true;
                 }
                 catch (Exception e)