Skip to content

Adjust Vertical Alignment and Margins in JsonSettingPanel #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 19, 2021
Merged

Adjust Vertical Alignment and Margins in JsonSettingPanel #910

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8331af
Adjust Vertical Aligment and margins
onesounds Dec 16, 2021
31ce34b
Adjust TextBlock Margin
onesounds Dec 17, 2021
a05f2bb
Adjust Control Aligment
onesounds Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,9 @@ public virtual async Task InitAsync(PluginInitContext context)
this.context = context;
await InitSettingAsync();
}
private static readonly Thickness settingControlMargin = new(10);
private static readonly Thickness settingControlMargin = new(10, 4, 10, 4);
private static readonly Thickness settingPanelMargin = new(15, 20, 15, 20);
private static readonly Thickness settingTextBlockMargin = new(10, 4, 10, 4);
private JsonRpcConfigurationModel _settingsTemplate;
public Control CreateSettingPanel()
{
Expand All @@ -363,7 +365,7 @@ public Control CreateSettingPanel()
var settingWindow = new UserControl();
var mainPanel = new StackPanel
{
Margin = settingControlMargin,
Margin = settingPanelMargin,
Orientation = Orientation.Vertical
};
settingWindow.Content = mainPanel;
Expand All @@ -375,10 +377,13 @@ public Control CreateSettingPanel()
Orientation = Orientation.Horizontal,
Margin = settingControlMargin
};
var name = new Label()
var name = new TextBlock()
{
Content = attribute.Label,
Margin = settingControlMargin
Text = attribute.Label,
Width = 120,
VerticalAlignment = VerticalAlignment.Center,
Margin = settingControlMargin,
TextWrapping = TextWrapping.WrapWithOverflow
};

FrameworkElement contentControl;
Expand All @@ -390,8 +395,8 @@ public Control CreateSettingPanel()
contentControl = new TextBlock
{
Text = attribute.Description.Replace("\\r\\n", "\r\n"),
Margin = settingControlMargin,
MaxWidth = 400,
Margin = settingTextBlockMargin,
MaxWidth = 500,
TextWrapping = TextWrapping.WrapWithOverflow
};
break;
Expand Down