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

Redesign settings panel for sys plugin & Improve design styles

Browse source
This commit is contained in:
Jack251970 2025-02-27 18:22:56 +08:00
parent 8fa34917aa
commit 64f02c3fd7
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,8 @@ namespace Flow.Launcher.Core.Plugin
private JsonStorage<ConcurrentDictionary<string, object>> _storage;
// maybe move to resource?
private static Thickness settingPanelMargin1 = (Thickness)System.Windows.Application.Current.FindResource("SettingPanelMargin");
private static readonly Thickness settingControlMargin = new(0, 9, 18, 9);
private static readonly Thickness settingCheckboxMargin = new(0, 9, 9, 9);
private static readonly Thickness settingPanelMargin = new(0, 0, 0, 0);

6
Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
View file

@ -20,7 +20,7 @@
Visibility="{Binding ActionKeywordsVisibility}">
<DockPanel Margin="{StaticResource SettingPanelMargin}">
<TextBlock
Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
Margin="{StaticResource SettingPanelItemRightMargin}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
DockPanel.Dock="Left"
@ -28,7 +28,7 @@
&#xe819;
</TextBlock>
<TextBlock
Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
Margin="{StaticResource SettingPanelItemRightMargin}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
DockPanel.Dock="Left"
@ -36,7 +36,7 @@
Text="{DynamicResource actionKeywords}" />
<Button
Width="100"
Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
Margin="{StaticResource SettingPanelItemLeftMargin}"
HorizontalAlignment="Right"
Command="{Binding SetActionKeywordsCommand}"
Content="{Binding ActionKeywordsText}"

9
Flow.Launcher/Resources/CustomControlTemplate.xaml
View file

@ -5587,8 +5587,13 @@
</Style>
<!-- Settings Panel -->
<Thickness x:Key="SettingPanelMargin">70,0,18,0</Thickness>
<Thickness x:Key="SettingPanelMargin">70,9,18,9</Thickness>
<Thickness x:Key="SettingPanelItemLeftMargin">9,0,0,0</Thickness>
<Thickness x:Key="SettingPanelItemRightMargin">0,0,9,0</Thickness>
<Thickness x:Key="SettingPanelItemTopBottomMargin">0,9,0,9</Thickness>
<Thickness x:Key="SettingPanelItemLeftTopBottomMargin">9,9,0,9</Thickness>
<Thickness x:Key="SettingPanelItemRightTopBottomMargin">0,9,9,9</Thickness>
<Thickness x:Key="SettingPanelItemLeftRightTopBottomMargin">9,9,9,9</Thickness>
<Thickness x:Key="SettingPanelItemLeftBottomMargin">9,0,0,9</Thickness>
<Thickness x:Key="SettingPanelItemRightBottomMargin">0,0,9,9</Thickness>
</ResourceDictionary>

4
Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
View file

@ -54,7 +54,7 @@
<TextBlock
Grid.Row="1"
Grid.Column="0"
Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
Margin="{StaticResource SettingPanelItemRightBottomMargin}"
VerticalAlignment="Center"
FontSize="14"
Text="{DynamicResource flowlauncher_plugin_calculator_max_decimal_places}" />
@ -62,7 +62,7 @@
x:Name="MaxDecimalPlaces"
Grid.Row="1"
Grid.Column="1"
Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
Margin="{StaticResource SettingPanelItemRightBottomMargin}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
ItemsSource="{Binding MaxDecimalPlacesRange}"

4
Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
View file

@ -7,11 +7,11 @@
d:DesignHeight="300"
d:DesignWidth="300"
mc:Ignorable="d">
<Grid Margin="70,18,18,18">
<Grid Margin="{StaticResource SettingPanelMargin}">
<ListView
x:Name="lbxCommands"
Grid.Row="0"
Margin="0"
Margin="{StaticResource SettingPanelItemTopBottomMargin}"
BorderBrush="DarkGray"
BorderThickness="1"
SizeChanged="ListView_SizeChanged"