Merge pull request #3260 from Jack251970/blank_settings_panel

Remove Useless Separate Line for Blank Settings Panel

Author: Jack251970

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

@@ -112,7 +112,7 @@ public void Save()
         public Control CreateSettingPanel()
         {
             if (Settings == null || Settings.Count == 0)
-                return new();
+                return null;
 
             var settingWindow = new UserControl();
             var mainPanel = new Grid { Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center };

Flow.Launcher/ViewModel/PluginViewModel.cs

@@ -90,7 +90,7 @@ public bool IsExpanded
         private Control _bottomPart2;
         public Control BottomPart2 => IsExpanded ? _bottomPart2 ??= new InstalledPluginDisplayBottomData() : null;
 
-        public bool HasSettingControl => PluginPair.Plugin is ISettingProvider;
+        public bool HasSettingControl => PluginPair.Plugin is ISettingProvider settingProvider && settingProvider.CreateSettingPanel() != null;
         public Control SettingControl
             => IsExpanded
                 ? _settingControl

Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj

@@ -42,7 +42,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
     <ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
   </ItemGroup>
 

Plugins/Flow.Launcher.Plugin.Url/Main.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using System.Windows.Controls;
 
 namespace Flow.Launcher.Plugin.Url
 {
-    public class Main : ISettingProvider,IPlugin, IPluginI18n
+    public class Main : IPlugin, IPluginI18n
     {
         //based on https://gist.github.com/dperini/729294
         private const string urlPattern = "^" +
@@ -43,7 +42,6 @@ public class Main : ISettingProvider,IPlugin, IPluginI18n
         Regex reg = new Regex(urlPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private PluginInitContext context;
         private Settings _settings;
-
 
         public List<Result> Query(Query query)
         {
@@ -82,12 +80,6 @@ public List<Result> Query(Query query)
             return new List<Result>(0);
         }
 
-
-        public Control CreateSettingPanel()
-        {
-            return new SettingsControl(context.API,_settings);
-        }
-
         public bool IsURL(string raw)
         {
             raw = raw.ToLower();