Skip to content

Commit 6de0ab8

Browse files
authored
Merge branch 'Flow-Launcher:dev' into settings_panel
2 parents 6e84326 + 8ae53a2 commit 6de0ab8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void Save()
112112
public Control CreateSettingPanel()
113113
{
114114
if (Settings == null || Settings.Count == 0)
115-
return new();
115+
return null;
116116

117117
var settingWindow = new UserControl();
118118
var mainPanel = new Grid { Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center };

Flow.Launcher/ViewModel/PluginViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public bool IsExpanded
9090
private Control _bottomPart2;
9191
public Control BottomPart2 => IsExpanded ? _bottomPart2 ??= new InstalledPluginDisplayBottomData() : null;
9292

93-
public bool HasSettingControl => PluginPair.Plugin is ISettingProvider;
93+
public bool HasSettingControl => PluginPair.Plugin is ISettingProvider settingProvider && settingProvider.CreateSettingPanel() != null;
9494
public Control SettingControl
9595
=> IsExpanded
9696
? _settingControl

0 commit comments

Comments
 (0)