PluginSettingsWindow: Change API Method to check for existing windows with the same plugin id and reuse

Author: DavidGBrett

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -164,10 +164,11 @@ public interface IPublicAPI
 
 
         /// <summary>
-        /// Open plugin setting window for a specific plugin
+        /// Open plugin setting window for a specific plugin.
+        /// Reuses the existing window when that plugin's settings window is already open.
         /// </summary>
         /// <param name="pluginId">ID of the plugin whose settings window should be opened</param>
-        /// <returns>True if the plugin settings window was successfully opened; false otherwise</returns>
+        /// <returns>True if the plugin settings window was successfully opened or reused; false otherwise</returns>
         bool OpenPluginSettingsWindow(string pluginId);
 
         /// <summary>

Flow.Launcher/PluginSettingsWindow.xaml.cs

@@ -13,6 +13,8 @@ public partial class PluginSettingsWindow
 {
     private readonly Settings _settings;
 
+    public string PluginId { get; }
+
     public PluginSettingsWindow(string pluginId)
     {
         _settings = Ioc.Default.GetRequiredService<Settings>();
@@ -21,6 +23,8 @@ public PluginSettingsWindow(string pluginId)
             throw new ArgumentException("Plugin ID cannot be null or whitespace.", nameof(pluginId));
         }
 
+        PluginId = pluginId;
+
         var pluginPair = PluginManager.GetPluginForId(pluginId);
         if (pluginPair == null)
         {

Flow.Launcher/PublicAPIInstance.cs

@@ -5,6 +5,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -153,8 +154,27 @@ public bool OpenPluginSettingsWindow(string pluginId)
             {
                 try
                 {
-                    var window = new PluginSettingsWindow(pluginId);
-                    window.Show();
+                    // get existing settings window for this plugin, or else create a new one
+                    var window = Application.Current.Windows
+                        .OfType<PluginSettingsWindow>()
+                        .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();
                     return true;
                 }
                 catch (Exception e)