Skip to content

Commit e28626a

Browse files
onesoundsonesounds
committed
Adjust Theme List Style
1 parent ea532a3 commit e28626a

File tree

2 files changed

+91
-113
lines changed

2 files changed

+91
-113
lines changed

‎Flow.Launcher/Resources/SettingWindowStyle.xaml

Lines changed: 69 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Setter.Value>
2626
<ControlTemplate>
2727
<Rectangle
28-
Margin="-8,-4,-8,-4"
28+
Margin="-8 -4 -8 -4"
2929
RadiusX="5"
3030
RadiusY="5"
3131
Stroke="{DynamicResource Color05B}"
@@ -54,31 +54,73 @@
5454
</Setter.Value>
5555
</Setter>
5656
</Style>
57+
<Style x:Key="ThemeList" TargetType="ListBoxItem">
58+
<Setter Property="Background" Value="Red" />
59+
<Setter Property="HorizontalContentAlignment" Value="Left" />
60+
<Setter Property="HorizontalAlignment" Value="Left" />
61+
<Setter Property="Padding" Value="0" />
62+
<Setter Property="Margin" Value="4" />
63+
<Setter Property="Template">
64+
<Setter.Value>
65+
<ControlTemplate TargetType="{x:Type ListBoxItem}">
66+
<Border
67+
x:Name="Bd"
68+
Padding="{TemplateBinding Padding}"
69+
Background="{DynamicResource Color12B}"
70+
BorderBrush="{DynamicResource Color03B}"
71+
BorderThickness="1 1 1 0"
72+
CornerRadius="4"
73+
SnapsToDevicePixels="true">
74+
<Border
75+
x:Name="Bd2"
76+
BorderBrush="{DynamicResource Color14B}"
77+
BorderThickness="0 0 0 2"
78+
CornerRadius="4">
79+
<ContentPresenter
80+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
81+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
82+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
83+
</Border>
84+
</Border>
85+
<ControlTemplate.Triggers>
86+
<Trigger Property="IsMouseOver" Value="true">
87+
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ThemeHoverButton}" />
88+
</Trigger>
89+
<Trigger Property="IsSelected" Value="true">
90+
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
91+
<Setter TargetName="Bd2" Property="BorderThickness" Value="0" />
92+
<Setter TargetName="Bd2" Property="TextElement.Foreground" Value="{DynamicResource Color02B}" />
93+
</Trigger>
94+
</ControlTemplate.Triggers>
95+
</ControlTemplate>
96+
</Setter.Value>
97+
</Setter>
98+
</Style>
5799
<Style x:Key="SettingGroupBox" TargetType="{x:Type Border}">
58100
<Setter Property="Background" Value="{DynamicResource Color00B}" />
59101
<Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
60102
<Setter Property="BorderThickness" Value="1" />
61103
<Setter Property="CornerRadius" Value="5" />
62-
<Setter Property="Margin" Value="0,5,0,0" />
63-
<Setter Property="Padding" Value="0,15,0,15" />
104+
<Setter Property="Margin" Value="0 5 0 0" />
105+
<Setter Property="Padding" Value="0 15 0 15" />
64106
<Setter Property="SnapsToDevicePixels" Value="True" />
65107
</Style>
66108
<Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
67109
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
68-
<Setter Property="Margin" Value="0,0,0,0" />
110+
<Setter Property="Margin" Value="0 0 0 0" />
69111
<Setter Property="TextWrapping" Value="Wrap" />
70112
</Style>
71113

72114
<Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}">
73115
<Setter Property="Foreground" Value="{DynamicResource Color04B}" />
74116
<Setter Property="FontSize" Value="12" />
75-
<Setter Property="Margin" Value="0,0,0,0" />
76-
<Setter Property="Padding" Value="0,0,24,0" />
117+
<Setter Property="Margin" Value="0 0 0 0" />
118+
<Setter Property="Padding" Value="0 0 24 0" />
77119
<Setter Property="TextWrapping" Value="WrapWithOverflow" />
78120
</Style>
79121
<Style x:Key="TextPanel" TargetType="{x:Type StackPanel}">
80122
<Setter Property="Grid.Column" Value="1" />
81-
<Setter Property="Margin" Value="0,0,0,0" />
123+
<Setter Property="Margin" Value="0 0 0 0" />
82124
<Setter Property="Width" Value="Auto" />
83125
<Setter Property="VerticalAlignment" Value="Center" />
84126
<Setter Property="HorizontalAlignment" Value="Left" />
@@ -89,7 +131,7 @@
89131
TargetType="{x:Type CheckBox}">
90132
<Setter Property="Width" Value="24" />
91133
<Setter Property="Grid.Column" Value="2" />
92-
<Setter Property="Margin" Value="0,4,10,4" />
134+
<Setter Property="Margin" Value="0 4 10 4" />
93135
<Setter Property="LayoutTransform">
94136
<Setter.Value>
95137
<ScaleTransform ScaleX="1" ScaleY="1" />
@@ -100,7 +142,7 @@
100142
<Style x:Key="SideTextAbout" TargetType="{x:Type TextBlock}">
101143
<Setter Property="HorizontalAlignment" Value="Right" />
102144
<Setter Property="Grid.Column" Value="1" />
103-
<Setter Property="Margin" Value="0,0,-18,0" />
145+
<Setter Property="Margin" Value="0 0 -18 0" />
104146
</Style>
105147

106148

@@ -123,8 +165,8 @@
123165
x:Name="Spacer"
124166
Width="Auto"
125167
Height="Auto"
126-
Margin="0,10,5,0"
127-
Padding="0,0,0,0"
168+
Margin="0 10 5 0"
169+
Padding="0 0 0 0"
128170
BorderBrush="Transparent"
129171
BorderThickness="0">
130172
<Border
@@ -133,7 +175,7 @@
133175
CornerRadius="5">
134176
<ContentPresenter
135177
x:Name="ContentSite"
136-
Margin="12,12,0,12"
178+
Margin="12 12 0 12"
137179
HorizontalAlignment="LEFT"
138180
VerticalAlignment="Center"
139181
ContentSource="Header"
@@ -165,8 +207,8 @@
165207
<Border
166208
x:Name="border"
167209
Height="40"
168-
Margin="14,4,8,4"
169-
Padding="0,0,0,0"
210+
Margin="14 4 8 4"
211+
Padding="0 0 0 0"
170212
HorizontalAlignment="Stretch"
171213
Background="{DynamicResource Color01B}"
172214
CornerRadius="5">
@@ -180,15 +222,15 @@
180222
Grid.Column="0"
181223
Width="4"
182224
Height="18"
183-
Margin="0,11,0,11"
225+
Margin="0 11 0 11"
184226
Fill="{DynamicResource ToggleSwitchFillOn}"
185227
RadiusX="2"
186228
RadiusY="2"
187229
Visibility="Hidden" />
188230
<ContentPresenter
189231
x:Name="ContentSite"
190232
Grid.Column="1"
191-
Margin="12,11,18,11"
233+
Margin="12 11 18 11"
192234
HorizontalAlignment="Stretch"
193235
VerticalAlignment="Center"
194236
ContentSource="Header"
@@ -212,10 +254,10 @@
212254

213255
<Style x:Key="PluginList" TargetType="ListBoxItem">
214256
<Setter Property="Background" Value="{DynamicResource Color00B}" />
215-
<Setter Property="Padding" Value="0,0,0,0" />
257+
<Setter Property="Padding" Value="0 0 0 0" />
216258
<Setter Property="UseLayoutRounding" Value="True" />
217259
<Setter Property="SnapsToDevicePixels" Value="True" />
218-
<Setter Property="Margin" Value="0,0,18,5" />
260+
<Setter Property="Margin" Value="0 0 18 5" />
219261
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
220262
<Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
221263
<!--#region Template for blue highlight win10-->
@@ -255,7 +297,7 @@
255297
</MultiTrigger.Conditions>
256298
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color00B}" />
257299
<Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" />
258-
<Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
300+
<Setter TargetName="Bd" Property="Margin" Value="0 0 0 0" />
259301

260302

261303
</MultiTrigger>
@@ -267,7 +309,7 @@
267309
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color00B}" />
268310
<Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" />
269311
<Setter TargetName="Bd" Property="CornerRadius" Value="5" />
270-
<Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
312+
<Setter TargetName="Bd" Property="Margin" Value="0 0 0 0" />
271313

272314

273315
</MultiTrigger>
@@ -284,10 +326,10 @@
284326

285327
<!--#region PluginStore Style-->
286328
<Style x:Key="StoreList" TargetType="ListViewItem">
287-
<Setter Property="Padding" Value="0,0,0,0" />
329+
<Setter Property="Padding" Value="0 0 0 0" />
288330
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
289331
<Setter Property="HorizontalAlignment" Value="Stretch" />
290-
<Setter Property="Margin" Value="0,0,8,8" />
332+
<Setter Property="Margin" Value="0 0 8 8" />
291333
<Setter Property="VerticalContentAlignment" Value="Stretch" />
292334
<!--#region Template for blue highlight win10-->
293335
<Setter Property="Template">
@@ -325,10 +367,10 @@
325367
<Setter Property="Template">
326368
<Setter.Value>
327369
<ControlTemplate>
328-
<Grid Margin="20,0,0,0">
370+
<Grid Margin="20 0 0 0">
329371
<StackPanel>
330372
<TextBlock
331-
Margin="0,20,0,4"
373+
Margin="0 20 0 4"
332374
FontWeight="Bold"
333375
Text="{DynamicResource searchplugin_Noresult_Title}" />
334376
<TextBlock Text="{DynamicResource searchplugin_Noresult_Subtitle}" />
@@ -351,10 +393,10 @@
351393
<Setter Property="Template">
352394
<Setter.Value>
353395
<ControlTemplate>
354-
<Grid Margin="20,0,0,0">
396+
<Grid Margin="20 0 0 0">
355397
<StackPanel>
356398
<TextBlock
357-
Margin="0,20,0,4"
399+
Margin="0 20 0 4"
358400
FontWeight="Bold"
359401
Text="{DynamicResource searchplugin_Noresult_Title}" />
360402
<TextBlock Text="{DynamicResource searchplugin_Noresult}" />
@@ -394,7 +436,7 @@
394436
x:Name="headerPanel"
395437
Grid.Row="0"
396438
Grid.Column="0"
397-
Margin="2,2,2,0"
439+
Margin="2 2 2 0"
398440
Panel.ZIndex="1"
399441
Background="Transparent"
400442
IsItemsHost="true"

0 commit comments

Comments
 (0)