Skip to content

Commit 523d8fe

Browse files
onesoundsonesounds
committed
Adjust Blur themes
1 parent 2c8cfa5 commit 523d8fe

File tree

4 files changed

+321
-112
lines changed

4 files changed

+321
-112
lines changed

‎Flow.Launcher/Themes/BlurBlack Darker.xaml

Lines changed: 81 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,130 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:system="clr-namespace:System;assembly=mscorlib">
1+
<ResourceDictionary
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:system="clr-namespace:System;assembly=mscorlib">
45
<ResourceDictionary.MergedDictionaries>
56
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
67
</ResourceDictionary.MergedDictionaries>
78

89
<system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
9-
10-
<Style x:Key="ItemGlyph" BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}">
10+
<Style x:Key="WindowRadius" TargetType="{x:Type Border}">
11+
<Setter Property="CornerRadius" Value="0" />
12+
</Style>
13+
<Style
14+
x:Key="ItemGlyph"
15+
BasedOn="{StaticResource BaseGlyphStyle}"
16+
TargetType="{x:Type TextBlock}">
1117
<Setter Property="Foreground" Value="#ffffff" />
1218
</Style>
13-
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
19+
<Style
20+
x:Key="QueryBoxStyle"
21+
BasedOn="{StaticResource BaseQueryBoxStyle}"
22+
TargetType="{x:Type TextBox}">
1423
<Setter Property="Foreground" Value="#FFFFFFFF" />
1524
<Setter Property="Background" Value="Transparent" />
1625
</Style>
1726

18-
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
27+
<Style
28+
x:Key="QuerySuggestionBoxStyle"
29+
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
30+
TargetType="{x:Type TextBox}">
1931
<Setter Property="Foreground" Value="LightGray" />
2032
<Setter Property="Opacity" Value="0.5" />
2133
</Style>
2234

23-
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
35+
<Style
36+
x:Key="WindowBorderStyle"
37+
BasedOn="{StaticResource BaseWindowBorderStyle}"
38+
TargetType="{x:Type Border}">
39+
<Setter Property="BorderThickness" Value="1" />
40+
<Setter Property="BorderBrush" Value="#444444" />
41+
<Setter Property="CornerRadius" Value="0" />
2442
<Setter Property="Background">
2543
<Setter.Value>
26-
<SolidColorBrush Color="Black" Opacity="0.6"/>
44+
<SolidColorBrush Opacity="0.9" Color="Black" />
2745
</Setter.Value>
2846
</Setter>
2947
</Style>
3048

31-
<Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
49+
<Style
50+
x:Key="WindowStyle"
51+
BasedOn="{StaticResource BaseWindowStyle}"
52+
TargetType="{x:Type Window}">
3253
<Setter Property="Background">
3354
<Setter.Value>
34-
<SolidColorBrush Color="Black" Opacity="0.7"/>
55+
<SolidColorBrush Opacity="0.7" Color="Black" />
3556
</Setter.Value>
3657
</Setter>
3758
</Style>
3859

39-
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
60+
<Style
61+
x:Key="PendingLineStyle"
62+
BasedOn="{StaticResource BasePendingLineStyle}"
63+
TargetType="{x:Type Line}">
4064
<Setter Property="Stroke" Value="White" />
4165
</Style>
4266

43-
<!-- Item Style -->
44-
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
45-
<Setter Property="Margin" Value="0, -10"/>
46-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
67+
<!-- Item Style -->
68+
<Style
69+
x:Key="ItemTitleStyle"
70+
BasedOn="{StaticResource BaseItemTitleStyle}"
71+
TargetType="{x:Type TextBlock}">
72+
<Setter Property="Margin" Value="0,-10" />
73+
<Setter Property="Foreground" Value="#FFFFFFFF" />
4774
</Style>
48-
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
49-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
75+
<Style
76+
x:Key="ItemSubTitleStyle"
77+
BasedOn="{StaticResource BaseItemSubTitleStyle}"
78+
TargetType="{x:Type TextBlock}">
79+
<Setter Property="Foreground" Value="#FFFFFFFF" />
5080
<Setter Property="Opacity" Value="0.5" />
5181
</Style>
52-
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
53-
<Setter Property="Margin" Value="0, -10"/>
54-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
82+
<Style
83+
x:Key="ItemTitleSelectedStyle"
84+
BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
85+
TargetType="{x:Type TextBlock}">
86+
<Setter Property="Margin" Value="0,-10" />
87+
<Setter Property="Foreground" Value="#FFFFFFFF" />
5588
</Style>
56-
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
57-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
89+
<Style
90+
x:Key="ItemSubTitleSelectedStyle"
91+
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
92+
TargetType="{x:Type TextBlock}">
93+
<Setter Property="Foreground" Value="#FFFFFFFF" />
5894
<Setter Property="Opacity" Value="0.5" />
5995
</Style>
60-
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#356ef3</SolidColorBrush>
96+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#19ffffff</SolidColorBrush>
6197

62-
<!-- button style in the middle of the scrollbar -->
63-
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
98+
<!-- button style in the middle of the scrollbar -->
99+
<Style
100+
x:Key="ThumbStyle"
101+
BasedOn="{StaticResource BaseThumbStyle}"
102+
TargetType="{x:Type Thumb}">
64103
<Setter Property="Template">
65104
<Setter.Value>
66105
<ControlTemplate TargetType="{x:Type Thumb}">
67-
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#FFFFFF" Opacity="0.5" BorderBrush="Transparent" BorderThickness="0" />
106+
<Border
107+
Background="#FFFFFF"
108+
BorderBrush="Transparent"
109+
BorderThickness="0"
110+
CornerRadius="2"
111+
DockPanel.Dock="Right"
112+
Opacity="0.5" />
68113
</ControlTemplate>
69114
</Setter.Value>
70115
</Setter>
71116
</Style>
72117

73-
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
74-
<Setter Property="Background" Value="#a0a0a0"/>
118+
<Style
119+
x:Key="ScrollBarStyle"
120+
BasedOn="{StaticResource BaseScrollBarStyle}"
121+
TargetType="{x:Type ScrollBar}">
122+
<Setter Property="Background" Value="#a0a0a0" />
75123
</Style>
76-
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
124+
<Style
125+
x:Key="SearchIconStyle"
126+
BasedOn="{StaticResource BaseSearchIconStyle}"
127+
TargetType="{x:Type Path}">
77128
<Setter Property="Fill" Value="#ffffff" />
78129
<Setter Property="Width" Value="32" />
79130
<Setter Property="Height" Value="32" />

‎Flow.Launcher/Themes/BlurBlack.xaml

Lines changed: 81 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,127 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:system="clr-namespace:System;assembly=mscorlib">
1+
<ResourceDictionary
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:system="clr-namespace:System;assembly=mscorlib">
45
<ResourceDictionary.MergedDictionaries>
56
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
67
</ResourceDictionary.MergedDictionaries>
78

89
<system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
9-
<Style x:Key="ItemGlyph" BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}">
10+
<Style x:Key="WindowRadius" TargetType="{x:Type Border}">
11+
<Setter Property="CornerRadius" Value="0" />
12+
</Style>
13+
<Style
14+
x:Key="ItemGlyph"
15+
BasedOn="{StaticResource BaseGlyphStyle}"
16+
TargetType="{x:Type TextBlock}">
1017
<Setter Property="Foreground" Value="#ffffff" />
1118
</Style>
12-
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
19+
<Style
20+
x:Key="QueryBoxStyle"
21+
BasedOn="{StaticResource BaseQueryBoxStyle}"
22+
TargetType="{x:Type TextBox}">
1323
<Setter Property="Foreground" Value="#FFFFFFFF" />
1424
<Setter Property="Background" Value="Transparent" />
1525
</Style>
1626

17-
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
27+
<Style
28+
x:Key="QuerySuggestionBoxStyle"
29+
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
30+
TargetType="{x:Type TextBox}">
1831
<Setter Property="Foreground" Value="LightGray" />
1932
</Style>
2033

21-
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
34+
<Style
35+
x:Key="WindowBorderStyle"
36+
BasedOn="{StaticResource BaseWindowBorderStyle}"
37+
TargetType="{x:Type Border}">
38+
<Setter Property="CornerRadius" Value="0" />
39+
<Setter Property="BorderThickness" Value="1" />
40+
<Setter Property="BorderBrush" Value="#444444" />
2241
<Setter Property="Background">
2342
<Setter.Value>
24-
<SolidColorBrush Color="Black" Opacity="0.7"/>
43+
<SolidColorBrush Opacity="0.7" Color="Black" />
2544
</Setter.Value>
2645
</Setter>
2746
</Style>
2847

29-
<Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
48+
<Style
49+
x:Key="WindowStyle"
50+
BasedOn="{StaticResource BaseWindowStyle}"
51+
TargetType="{x:Type Window}">
3052
<Setter Property="Background">
3153
<Setter.Value>
32-
<SolidColorBrush Color="Black" Opacity="0.3"/>
54+
<SolidColorBrush Opacity="0.3" Color="Black" />
3355
</Setter.Value>
3456
</Setter>
3557
</Style>
3658

37-
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
59+
<Style
60+
x:Key="PendingLineStyle"
61+
BasedOn="{StaticResource BasePendingLineStyle}"
62+
TargetType="{x:Type Line}">
3863
<Setter Property="Stroke" Value="White" />
3964
</Style>
4065

41-
<!-- Item Style -->
42-
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
43-
<Setter Property="Margin" Value="0, -10"/>
44-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
66+
<!-- Item Style -->
67+
<Style
68+
x:Key="ItemTitleStyle"
69+
BasedOn="{StaticResource BaseItemTitleStyle}"
70+
TargetType="{x:Type TextBlock}">
71+
<Setter Property="Margin" Value="0,-10" />
72+
<Setter Property="Foreground" Value="#FFFFFFFF" />
4573
</Style>
46-
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
47-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
74+
<Style
75+
x:Key="ItemSubTitleStyle"
76+
BasedOn="{StaticResource BaseItemSubTitleStyle}"
77+
TargetType="{x:Type TextBlock}">
78+
<Setter Property="Foreground" Value="#FFFFFFFF" />
4879
</Style>
49-
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
50-
<Setter Property="Margin" Value="0, -10"/>
51-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
80+
<Style
81+
x:Key="ItemTitleSelectedStyle"
82+
BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
83+
TargetType="{x:Type TextBlock}">
84+
<Setter Property="Margin" Value="0,-10" />
85+
<Setter Property="Foreground" Value="#FFFFFFFF" />
5286
</Style>
53-
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
54-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
87+
<Style
88+
x:Key="ItemSubTitleSelectedStyle"
89+
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
90+
TargetType="{x:Type TextBlock}">
91+
<Setter Property="Foreground" Value="#FFFFFFFF" />
5592
</Style>
56-
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#356ef3</SolidColorBrush>
93+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#19c9c9c9</SolidColorBrush>
5794

58-
<!-- button style in the middle of the scrollbar -->
59-
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
95+
<!-- button style in the middle of the scrollbar -->
96+
<Style
97+
x:Key="ThumbStyle"
98+
BasedOn="{StaticResource BaseThumbStyle}"
99+
TargetType="{x:Type Thumb}">
60100
<Setter Property="Template">
61101
<Setter.Value>
62102
<ControlTemplate TargetType="{x:Type Thumb}">
63-
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#ffffff" Opacity="0.5" BorderBrush="Transparent" BorderThickness="0" />
103+
<Border
104+
Background="#ffffff"
105+
BorderBrush="Transparent"
106+
BorderThickness="0"
107+
CornerRadius="2"
108+
DockPanel.Dock="Right"
109+
Opacity="0.5" />
64110
</ControlTemplate>
65111
</Setter.Value>
66112
</Setter>
67113
</Style>
68114

69-
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
70-
<Setter Property="Background" Value="#a0a0a0"/>
115+
<Style
116+
x:Key="ScrollBarStyle"
117+
BasedOn="{StaticResource BaseScrollBarStyle}"
118+
TargetType="{x:Type ScrollBar}">
119+
<Setter Property="Background" Value="#a0a0a0" />
71120
</Style>
72-
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
121+
<Style
122+
x:Key="SearchIconStyle"
123+
BasedOn="{StaticResource BaseSearchIconStyle}"
124+
TargetType="{x:Type Path}">
73125
<Setter Property="Fill" Value="#ffffff" />
74126
<Setter Property="Width" Value="32" />
75127
<Setter Property="Height" Value="32" />

0 commit comments

Comments
 (0)