Skip to content

Commit b29bc75

Browse files
committed
Improve setting panel design
1 parent 05cd01d commit b29bc75

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
xmlns:ui="http://schemas.modernwpf.com/2019"
1111
xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Explorer.ViewModels"
1212
xmlns:views="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
13-
Margin="-72 0 -19 -14"
1413
d:DataContext="{d:DesignInstance viewModels:SettingsViewModel}"
1514
d:DesignHeight="450"
1615
d:DesignWidth="800"
@@ -86,7 +85,7 @@
8685
<Setter.Value>
8786
<DataTemplate>
8887
<TextBlock
89-
Margin="10 2 2 5"
88+
Margin="8 5 0 5"
9089
FontSize="14"
9190
Foreground="{DynamicResource Color05B}"
9291
Text="{Binding}" />
@@ -101,8 +100,9 @@
101100
</Style>
102101
</UserControl.Resources>
103102

104-
<Grid Margin="{StaticResource SettingPanelMargin}">
105-
<ScrollViewer Margin="0 -10 0 0" VerticalScrollBarVisibility="Auto">
103+
<!-- Margin="-2 0 -2 0" is to make sure separator between expanders are expanded to left & right boarder -->
104+
<Grid Margin="-2 0 -2 0">
105+
<ScrollViewer VerticalScrollBarVisibility="Auto">
106106
<StackPanel x:Name="ExpanderContainer">
107107
<!-- General Settings Expander -->
108108
<Expander
@@ -113,7 +113,8 @@
113113
Loaded="GeneralSettingsExpander_Loaded"
114114
Style="{StaticResource CustomExpanderStyle}">
115115

116-
<Grid Margin="20 5 0 5">
116+
<!-- Margin="32 -10 0 5" is to make sure elements is left aligned to the text in the expander text -->
117+
<Grid Margin="32 -10 0 5">
117118
<Grid.RowDefinitions>
118119
<RowDefinition Height="Auto" />
119120
<RowDefinition Height="Auto" />
@@ -333,7 +334,7 @@
333334
Header="{DynamicResource plugin_explorer_native_context_menu_header}"
334335
IsExpanded="False"
335336
Style="{StaticResource CustomExpanderStyle}">
336-
<Grid Margin="20 5 0 5">
337+
<Grid Margin="32 -10 0 5">
337338
<Grid.RowDefinitions>
338339
<RowDefinition Height="Auto" />
339340
<RowDefinition Height="Auto" />
@@ -403,7 +404,7 @@
403404
Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
404405
IsExpanded="False"
405406
Style="{StaticResource CustomExpanderStyle}">
406-
<Grid Margin="20 5 0 5">
407+
<Grid Margin="32 -10 0 5">
407408
<Grid.RowDefinitions>
408409
<RowDefinition Height="Auto" />
409410
<RowDefinition Height="Auto" />
@@ -500,7 +501,7 @@
500501
Header="{DynamicResource plugin_explorer_everything_setting_header}"
501502
IsExpanded="False"
502503
Style="{StaticResource CustomExpanderStyle}">
503-
<Grid Margin="20 5 0 5">
504+
<Grid Margin="32 -10 0 5">
504505
<Grid.RowDefinitions>
505506
<RowDefinition Height="Auto" />
506507
<RowDefinition Height="Auto" />
@@ -592,7 +593,7 @@
592593
Header="{DynamicResource plugin_explorer_manageactionkeywords_header}"
593594
IsExpanded="False"
594595
Style="{StaticResource CustomExpanderStyle}">
595-
<Grid Margin="20 5 0 5">
596+
<Grid Margin="32 -10 0 5">
596597
<Grid.RowDefinitions>
597598
<RowDefinition Height="Auto" />
598599
<RowDefinition Height="Auto" />
@@ -638,7 +639,7 @@
638639
Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
639640
IsExpanded="False"
640641
Style="{StaticResource CustomExpanderStyle}">
641-
<Grid Margin="20 5 0 5">
642+
<Grid Margin="32 -10 0 5">
642643
<Grid.RowDefinitions>
643644
<RowDefinition Height="Auto" />
644645
<RowDefinition Height="Auto" />
@@ -706,7 +707,7 @@
706707
Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
707708
IsExpanded="False"
708709
Style="{StaticResource CustomExpanderStyle}">
709-
<Grid Margin="20 5 0 5">
710+
<Grid Margin="32 -10 0 5">
710711
<Grid.RowDefinitions>
711712
<RowDefinition Height="Auto" />
712713
<RowDefinition Height="Auto" />

0 commit comments

Comments
 (0)