prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve JsonRPC settings panel design

Browse source
This commit is contained in:
Jack251970 2025-03-01 12:13:58 +08:00
parent f99648f3b4
commit e893645b24
1 changed files with 36 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
View file

@ -25,13 +25,9 @@ namespace Flow.Launcher.Core.Plugin
private JsonStorage<ConcurrentDictionary<string, object>> _storage = null!; private JsonStorage<ConcurrentDictionary<string, object>> _storage = null!;
private static readonly Thickness SettingPanelMargin = (Thickness)Application.Current.FindResource("SettingPanelMargin"); private static readonly Thickness SettingPanelMargin = (Thickness)Application.Current.FindResource("SettingPanelMargin");
private static readonly Thickness SettingPanelItemLeftMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftMargin"); private static readonly Thickness SettingPanelItemLeftMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftMargin");
private static readonly Thickness SettingPanelItemRightMargin = (Thickness)Application.Current.FindResource("SettingPanelItemRightMargin");
private static readonly Thickness SettingPanelItemTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemTopBottomMargin"); private static readonly Thickness SettingPanelItemTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemTopBottomMargin");
private static readonly Thickness SettingPanelItemLeftTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftTopBottomMargin"); private static readonly Thickness SettingPanelItemLeftTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftTopBottomMargin");
private static readonly Thickness SettingPanelItemRightTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemRightTopBottomMargin");
public async Task InitializeAsync() public async Task InitializeAsync()
{ {
@ -195,8 +191,9 @@ namespace Flow.Launcher.Core.Plugin
contentControl = new TextBlock contentControl = new TextBlock
{ {
Text = attributes.Description?.Replace("\\r\\n", "\r\n") ?? string.Empty, Text = attributes.Description?.Replace("\\r\\n", "\r\n") ?? string.Empty,
Margin = SettingPanelItemTopBottomMargin,
HorizontalAlignment = HorizontalAlignment.Left, HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemTopBottomMargin,
TextAlignment = TextAlignment.Left, TextAlignment = TextAlignment.Left,
TextWrapping = TextWrapping.Wrap TextWrapping = TextWrapping.Wrap
}; };
@ -207,9 +204,11 @@ namespace Flow.Launcher.Core.Plugin
{ {
var textBox = new TextBox() var textBox = new TextBox()
{ {
Text = Settings[attributes.Name] as string ?? string.Empty, MinWidth = 180,
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemLeftTopBottomMargin, Margin = SettingPanelItemLeftTopBottomMargin,
HorizontalAlignment = HorizontalAlignment.Stretch, Text = Settings[attributes.Name] as string ?? string.Empty,
ToolTip = attributes.Description ToolTip = attributes.Description
}; };
@ -227,9 +226,11 @@ namespace Flow.Launcher.Core.Plugin
{ {
var textBox = new TextBox() var textBox = new TextBox()
{ {
MinWidth = 240,
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemLeftMargin, Margin = SettingPanelItemLeftMargin,
Text = Settings[attributes.Name] as string ?? string.Empty, Text = Settings[attributes.Name] as string ?? string.Empty,
HorizontalAlignment = HorizontalAlignment.Stretch,
ToolTip = attributes.Description ToolTip = attributes.Description
}; };
@ -240,6 +241,8 @@ namespace Flow.Launcher.Core.Plugin
var Btn = new Button() var Btn = new Button()
{ {
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemLeftMargin, Margin = SettingPanelItemLeftMargin,
Content = "Browse" // TODO: Localization Content = "Browse" // TODO: Localization
}; };
@ -268,16 +271,19 @@ namespace Flow.Launcher.Core.Plugin
Settings[attributes.Name] = path; Settings[attributes.Name] = path;
}; };
var dockPanel = new DockPanel() var stackPanel = new StackPanel()
{ {
Margin = SettingPanelItemTopBottomMargin HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemTopBottomMargin,
Orientation = Orientation.Horizontal
}; };
DockPanel.SetDock(Btn, Dock.Right); // Create a stack panel to wrap the button and text box
dockPanel.Children.Add(Btn); stackPanel.Children.Add(textBox);
dockPanel.Children.Add(textBox); stackPanel.Children.Add(Btn);
contentControl = dockPanel; contentControl = stackPanel;
break; break;
} }
@ -286,11 +292,12 @@ namespace Flow.Launcher.Core.Plugin
var textBox = new TextBox() var textBox = new TextBox()
{ {
Height = 150, Height = 150,
Margin = SettingPanelItemLeftTopBottomMargin, MinWidth = 180,
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemLeftTopBottomMargin,
TextWrapping = TextWrapping.WrapWithOverflow, TextWrapping = TextWrapping.WrapWithOverflow,
AcceptsReturn = true, AcceptsReturn = true,
HorizontalAlignment = HorizontalAlignment.Stretch,
Text = Settings[attributes.Name] as string ?? string.Empty, Text = Settings[attributes.Name] as string ?? string.Empty,
ToolTip = attributes.Description ToolTip = attributes.Description
}; };
@ -308,10 +315,12 @@ namespace Flow.Launcher.Core.Plugin
{ {
var passwordBox = new PasswordBox() var passwordBox = new PasswordBox()
{ {
MinWidth = 180,
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemLeftTopBottomMargin, Margin = SettingPanelItemLeftTopBottomMargin,
Password = Settings[attributes.Name] as string ?? string.Empty, Password = Settings[attributes.Name] as string ?? string.Empty,
PasswordChar = attributes.passwordChar == default ? '*' : attributes.passwordChar, PasswordChar = attributes.passwordChar == default ? '*' : attributes.passwordChar,
HorizontalAlignment = HorizontalAlignment.Stretch,
ToolTip = attributes.Description ToolTip = attributes.Description
}; };
@ -330,8 +339,9 @@ namespace Flow.Launcher.Core.Plugin
{ {
ItemsSource = attributes.Options, ItemsSource = attributes.Options,
SelectedItem = Settings[attributes.Name], SelectedItem = Settings[attributes.Name],
Margin = SettingPanelItemLeftTopBottomMargin,
HorizontalAlignment = HorizontalAlignment.Left, HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemLeftTopBottomMargin,
ToolTip = attributes.Description ToolTip = attributes.Description
}; };
@ -352,8 +362,9 @@ namespace Flow.Launcher.Core.Plugin
Settings[attributes.Name] is bool isChecked Settings[attributes.Name] is bool isChecked
? isChecked ? isChecked
: bool.Parse(attributes.DefaultValue), : bool.Parse(attributes.DefaultValue),
Margin = SettingPanelItemTopBottomMargin,
HorizontalAlignment = HorizontalAlignment.Left, HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemTopBottomMargin,
Content = attributes.Label, Content = attributes.Label,
ToolTip = attributes.Description ToolTip = attributes.Description
}; };
@ -382,17 +393,17 @@ namespace Flow.Launcher.Core.Plugin
e.Handled = true; e.Handled = true;
}; };
var textBlock = new TextBlock(); var textBlock = new TextBlock()
textBlock.Inlines.Add(hyperlink);
var linkbtn = new Button
{ {
HorizontalAlignment = HorizontalAlignment.Left, HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemLeftTopBottomMargin, Margin = SettingPanelItemLeftTopBottomMargin,
Content = textBlock TextAlignment = TextAlignment.Left,
TextWrapping = TextWrapping.Wrap
}; };
textBlock.Inlines.Add(hyperlink);
contentControl = linkbtn; contentControl = textBlock;
break; break;
} }