Skip to content

Commit 2144577

Browse files
onesoundsonesounds
committed
- Adjust Theme Preivew in setting window
- Adjus Classic Themes - Adjust Dragable Area and default Width
2 parents 39b53d9 + 2b7855c commit 2144577

17 files changed

+186
-67
lines changed

‎Flow.Launcher/MainWindow.xaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@
6969
<Grid>
7070
<TextBox x:Name="QueryTextSuggestionBox"
7171
Style="{DynamicResource QuerySuggestionBoxStyle}"
72-
IsEnabled="False"
73-
Padding="16,0,60,0">
72+
IsEnabled="False">
7473
<TextBox.Text>
7574
<MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
7675
<Binding ElementName="QueryTextBox" Path="Text"/>
@@ -84,8 +83,7 @@
8483
PreviewDragOver="OnPreviewDragOver"
8584
AllowDrop="True"
8685
Visibility="Visible"
87-
Background="Transparent"
88-
Padding="16,0,60,0">
86+
Background="Transparent">
8987
<TextBox.ContextMenu>
9088
<ContextMenu>
9189
<MenuItem Command="ApplicationCommands.Cut"/>

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,21 +268,25 @@
268268
</Border.Clip>
269269
<Grid>
270270
<Grid.RowDefinitions>
271-
<RowDefinition Height="58" />
271+
<RowDefinition Height="54"/>
272+
<RowDefinition />
272273
<RowDefinition />
273274
</Grid.RowDefinitions>
274-
<TextBox Grid.Row="0"
275+
<Border Grid.Row="0">
276+
<TextBox
275277
Text="{DynamicResource hiThere}" IsReadOnly="True"
276-
Style="{DynamicResource QueryBoxStyle}"
277-
Margin="16 0 56 0" />
278+
Style="{DynamicResource QueryBoxStyle}"/>
279+
280+
</Border>
278281
<Canvas Style="{DynamicResource SearchIconPosition}">
279282
<Path Data="{DynamicResource SearchIconImg}" Style="{DynamicResource SearchIconStyle}" Margin="0" Stretch="Fill"/>
280283
</Canvas>
281-
<Border Height="58" Margin="0 28 0 0">
284+
285+
<Border Margin="0 0 0 0" Grid.Row="1">
282286
<Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" Visibility="visible"/>
283287
</Border>
284288

285-
<ContentControl Grid.Row="1">
289+
<ContentControl Grid.Row="2">
286290
<flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" />
287291
</ContentControl>
288292

‎Flow.Launcher/Themes/Base.xaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
<Setter Property="BorderThickness" Value="0" />
88
<Setter Property="FontSize" Value="28" />
99
<Setter Property="FontWeight" Value="Regular" />
10-
<Setter Property="Height" Value="56" />
10+
<Setter Property="Height" Value="40" />
11+
<Setter Property="Margin" Value="16 7 0 7" />
1112
<Setter Property="Padding" Value="0 4 0 0" />
1213
<Setter Property="Background" Value="#2F2F2F" />
13-
<Setter Property="Width" Value="586" />
14+
<Setter Property="Width" Value="470" />
1415
<Setter Property="Foreground" Value="#E3E0E3" />
1516
<Setter Property="CaretBrush" Value="#E3E0E3" />
1617
<Setter Property="VerticalContentAlignment" Value="Center" />
@@ -39,10 +40,13 @@
3940
<!-- Further font customisations are dynamically loaded in Theme.cs -->
4041
<Style x:Key="BaseQuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
4142
<Setter Property="Foreground" Value="DarkGray" />
42-
<Setter Property="Width" Value="56" />
43+
<Setter Property="Height" Value="40" />
44+
<Setter Property="Margin" Value="16 7 0 7" />
45+
<Setter Property="Width" Value="470" />
4346
<Setter Property="Background" Value="Transparent" />
4447
<Setter Property="Padding" Value="0 4 0 0" />
4548
<Setter Property="HorizontalAlignment" Value="Left" />
49+
<Setter Property="VerticalAlignment" Value="Center" />
4650
</Style>
4751

4852
<Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
@@ -52,7 +56,7 @@
5256
<Setter Property="CornerRadius" Value="5" />
5357
</Style>
5458
<Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
55-
<Setter Property="Width" Value="586" />
59+
<Setter Property="Width" Value="576" />
5660
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
5761
</Style>
5862

‎Flow.Launcher/Themes/BlackAndWhite.xaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
</Style>
1010
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
1111
<Setter Property="Background" Value="#000000" />
12-
<Setter Property="Foreground" Value="#ffffff" />
12+
<Setter Property="Foreground" Value="#8f8f8f" />
1313
</Style>
1414
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
1515
<Setter Property="CornerRadius" Value="4" />
1616
<Setter Property="BorderThickness" Value="1" />
17-
<Setter Property="BorderBrush" Value="#1f1d1f" />
17+
<Setter Property="BorderBrush" Value="#494949" />
1818
<Setter Property="Background" Value="#000000" />
1919
</Style>
2020
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" />
@@ -23,15 +23,22 @@
2323
<Setter Property="Foreground" Value="#FFFFF8" />
2424
</Style>
2525
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
26-
<Setter Property="Foreground" Value="#D9D9D4" />
26+
<Setter Property="Foreground" Value="#8f8f8f" />
2727
</Style>
2828
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
2929
<Setter Property="Foreground" Value="#FFFFF8" />
3030
</Style>
3131
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
32-
<Setter Property="Foreground" Value="#D9D9D4" />
32+
<Setter Property="Foreground" Value="#8f8f8f" />
3333
</Style>
34-
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#4F6180</SolidColorBrush>
34+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#494949</SolidColorBrush>
3535
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}" />
3636
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}" />
37+
<Style x:Key="HighlightStyle">
38+
<Setter Property="Inline.FontWeight" Value="Bold" />
39+
</Style>
40+
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
41+
<Setter Property="FontSize" Value="15" />
42+
<Setter Property="Foreground" Value="#b2b2b2" />
43+
</Style>
3744
</ResourceDictionary>

‎Flow.Launcher/Themes/BlurBlack Darker.xaml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
1616
<Setter Property="Foreground" Value="LightGray" />
17+
<Setter Property="Opacity" Value="0.5" />
1718
</Style>
1819

1920
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
@@ -27,7 +28,7 @@
2728
<Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
2829
<Setter Property="Background">
2930
<Setter.Value>
30-
<SolidColorBrush Color="Black" Opacity="0.6"/>
31+
<SolidColorBrush Color="Black" Opacity="0.7"/>
3132
</Setter.Value>
3233
</Setter>
3334
</Style>
@@ -42,21 +43,41 @@
4243
</Style>
4344
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
4445
<Setter Property="Foreground" Value="#FFFFFFFF"/>
46+
<Setter Property="Opacity" Value="0.5" />
4547
</Style>
4648
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
4749
<Setter Property="Margin" Value="0, -10"/>
4850
<Setter Property="Foreground" Value="#FFFFFFFF"/>
4951
</Style>
5052
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
5153
<Setter Property="Foreground" Value="#FFFFFFFF"/>
54+
<Setter Property="Opacity" Value="0.5" />
5255
</Style>
5356
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#356ef3</SolidColorBrush>
5457

5558
<!-- button style in the middle of the scrollbar -->
5659
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
60+
<Setter Property="Template">
61+
<Setter.Value>
62+
<ControlTemplate TargetType="{x:Type Thumb}">
63+
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#FFFFFF" Opacity="0.5" BorderBrush="Transparent" BorderThickness="0" />
64+
</ControlTemplate>
65+
</Setter.Value>
66+
</Setter>
5767
</Style>
5868

5969
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
6070
<Setter Property="Background" Value="#a0a0a0"/>
6171
</Style>
72+
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
73+
<Setter Property="Fill" Value="#ffffff" />
74+
<Setter Property="Width" Value="32" />
75+
<Setter Property="Height" Value="32" />
76+
<Setter Property="Opacity" Value="0.2" />
77+
</Style>
78+
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
79+
<Setter Property="FontSize" Value="14" />
80+
<Setter Property="Foreground" Value="#ffffff" />
81+
<Setter Property="Opacity" Value="0.2" />
82+
</Style>
6283
</ResourceDictionary>

‎Flow.Launcher/Themes/BlurBlack.xaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
2020
<Setter Property="Background">
2121
<Setter.Value>
22-
<SolidColorBrush Color="Black" Opacity="0.3"/>
22+
<SolidColorBrush Color="Black" Opacity="0.5"/>
2323
</Setter.Value>
2424
</Setter>
2525
</Style>
@@ -54,9 +54,27 @@
5454

5555
<!-- button style in the middle of the scrollbar -->
5656
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
57+
<Setter Property="Template">
58+
<Setter.Value>
59+
<ControlTemplate TargetType="{x:Type Thumb}">
60+
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#ffffff" Opacity="0.5" BorderBrush="Transparent" BorderThickness="0" />
61+
</ControlTemplate>
62+
</Setter.Value>
63+
</Setter>
5764
</Style>
5865

5966
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
6067
<Setter Property="Background" Value="#a0a0a0"/>
6168
</Style>
69+
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
70+
<Setter Property="Fill" Value="#ffffff" />
71+
<Setter Property="Width" Value="32" />
72+
<Setter Property="Height" Value="32" />
73+
<Setter Property="Opacity" Value="0.5" />
74+
</Style>
75+
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
76+
<Setter Property="FontSize" Value="14" />
77+
<Setter Property="Foreground" Value="#ffffff" />
78+
<Setter Property="Opacity" Value="0.5" />
79+
</Style>
6280
</ResourceDictionary>

‎Flow.Launcher/Themes/BlurWhite.xaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,26 @@
5252

5353
<!-- button style in the middle of the scrollbar -->
5454
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
55+
<Setter Property="Template">
56+
<Setter.Value>
57+
<ControlTemplate TargetType="{x:Type Thumb}">
58+
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#FFFFFF" BorderBrush="Transparent" BorderThickness="0" />
59+
</ControlTemplate>
60+
</Setter.Value>
61+
</Setter>
5562
</Style>
56-
5763
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
5864
<Setter Property="Background" Value="#a0a0a0"/>
5965
</Style>
66+
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
67+
<Setter Property="Fill" Value="#000000" />
68+
<Setter Property="Width" Value="32" />
69+
<Setter Property="Height" Value="32" />
70+
<Setter Property="Opacity" Value="0.2" />
71+
</Style>
72+
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
73+
<Setter Property="FontSize" Value="14" />
74+
<Setter Property="Foreground" Value="#000000" />
75+
<Setter Property="Opacity" Value="0.2" />
76+
</Style>
6077
</ResourceDictionary>

‎Flow.Launcher/Themes/Darker.xaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
</ResourceDictionary.MergedDictionaries>
77

88
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
9+
<Setter Property="SelectionBrush" Value="#6e6e6e"/>
910
<Setter Property="SelectionBrush" Value="#4D4D4D"/>
1011
</Style>
1112

12-
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}"/>
13-
14-
13+
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
14+
<Setter Property="Foreground" Value="#8f8f8f" />
15+
</Style>
1516
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
1617
</Style>
1718

@@ -25,11 +26,13 @@
2526
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
2627
</Style>
2728
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
29+
<Setter Property="Foreground" Value="#8f8f8f" />
2830
</Style>
2931
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
3032
<Setter Property="Cursor" Value="Arrow" />
3133
</Style>
3234
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
35+
<Setter Property="Foreground" Value="#8f8f8f" />
3336
<Setter Property="Cursor" Value="Arrow" />
3437
</Style>
3538
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#4d4d4d</SolidColorBrush>

‎Flow.Launcher/Themes/Gray.xaml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
1212
<Setter Property="Background" Value="LightGray" />
13-
<Setter Property="Foreground" Value="#6E6E6E" />
13+
<Setter Property="Foreground" Value="#b8b8b8" />
1414
</Style>
1515

1616
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
1717
<Setter Property="BorderBrush" Value="LightGray" />
18-
<Setter Property="BorderThickness" Value="1" />
18+
<Setter Property="BorderThickness" Value="2" />
1919
<Setter Property="Background" Value="LightGray"></Setter>
2020
</Style>
2121
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
@@ -29,20 +29,22 @@
2929
<Setter Property="Foreground" Value="#A6A6A6" />
3030
</Style>
3131
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
32-
<Setter Property="Foreground" Value="#6B6B6B" />
32+
<Setter Property="Foreground" Value="#818181" />
33+
<Setter Property="FontSize" Value="13" />
3334
</Style>
3435
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
3536
<Setter Property="Foreground" Value="White" />
3637
</Style>
3738
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
38-
<Setter Property="Foreground" Value="#EDEDED" />
39+
<Setter Property="Foreground" Value="Silver" />
40+
<Setter Property="FontSize" Value="13" />
3941
</Style>
4042
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#787878</SolidColorBrush>
4143
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
4244
<Setter Property="Template">
4345
<Setter.Value>
4446
<ControlTemplate TargetType="{x:Type Thumb}">
45-
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#DBDADB" BorderBrush="Transparent" BorderThickness="0" />
47+
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#eeeeee" BorderBrush="Transparent" BorderThickness="0" />
4648
</ControlTemplate>
4749
</Setter.Value>
4850
</Setter>
@@ -51,4 +53,13 @@
5153
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}" >
5254
<Setter Property="Width" Value="3"/>
5355
</Style>
56+
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
57+
<Setter Property="Fill" Value="#a4a4a4" />
58+
<Setter Property="Width" Value="32" />
59+
<Setter Property="Height" Value="32" />
60+
</Style>
61+
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
62+
<Setter Property="FontSize" Value="15" />
63+
<Setter Property="Foreground" Value="#a3a3a3" />
64+
</Style>
5465
</ResourceDictionary>

0 commit comments

Comments
 (0)