Skip to content

Commit 64f1e28

Browse files
onesoundsonesounds
committed
Add System Base Theme & Color Palette
Adjust Default Themes Change Default theme to Win11System from Win11Light
1 parent 6aefca2 commit 64f1e28

File tree

7 files changed

+279
-40
lines changed

7 files changed

+279
-40
lines changed

‎Flow.Launcher/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ui:ThemeResources>
2525
<ui:XamlControlsResources />
2626
<ResourceDictionary Source="pack://application:,,,/Resources/CustomControlTemplate.xaml" />
27-
<ResourceDictionary Source="pack://application:,,,/Themes/Win11Light.xaml" />
27+
<ResourceDictionary Source="pack://application:,,,/Themes/Win11System.xaml" />
2828
<ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" />
2929
</ResourceDictionary.MergedDictionaries>
3030
</ResourceDictionary>

‎Flow.Launcher/Languages/en.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<system:String x:Key="ThemeFolder">Theme Folder</system:String>
8585
<system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
8686
<system:String x:Key="DarkMode">Dark Mode</system:String>
87-
<system:String x:Key="DarkModeTip">System settings will take effect from the next run.</system:String>
87+
<system:String x:Key="DarkModeTip">System settings will take effect from the next run</system:String>
8888
<system:String x:Key="DarkModeSystem">System Default</system:String>
8989
<system:String x:Key="DarkModeLight">Light</system:String>
9090
<system:String x:Key="DarkModeDark">Dark</system:String>

‎Flow.Launcher/Resources/Dark.xaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@
66
xmlns:primitives="http://schemas.modernwpf.com/2019"
77
xmlns:sys="clr-namespace:System;assembly=mscorlib">
88

9+
<SolidColorBrush x:Key="SystemThemeBorder" Color="#3f3f3f" />
10+
<SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#7b7b7b" />
11+
<SolidColorBrush x:Key="QuerySelectionBrush" Color="#4a5459" />
12+
<SolidColorBrush x:Key="SubTitleForeground" Color="#7b7b7b" />
13+
<SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#7b7b7b" />
14+
<SolidColorBrush x:Key="SearchIconForeground" Color="#4d4d4d" />
15+
<SolidColorBrush x:Key="SeparatorForeground" Color="#4d4d4d" />
16+
<SolidColorBrush x:Key="ThumbColor" Color="#9a9a9a" />
17+
<SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
18+
<SolidColorBrush x:Key="HotkeyForeground" Color="#7b7b7b" />
19+
<SolidColorBrush x:Key="HotkeySelectedForeground" Color="#7b7b7b" />
20+
<Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
21+
22+
923
<SolidColorBrush x:Key="Color00B" Color="#2b2b2b" />
1024
<SolidColorBrush x:Key="Color01B" Color="#202020" />
1125
<SolidColorBrush x:Key="Color02B" Color="#2b2b2b" />

‎Flow.Launcher/Resources/Light.xaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,19 @@
66
xmlns:primitives="http://schemas.modernwpf.com/2019"
77
xmlns:sys="clr-namespace:System;assembly=mscorlib">
88

9+
<SolidColorBrush x:Key="SystemThemeBorder" Color="#aaaaaa" />
10+
<SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#b5b5b5" />
11+
<SolidColorBrush x:Key="QuerySelectionBrush" Color="#0a68d8" />
12+
<SolidColorBrush x:Key="SubTitleForeground" Color="#818181" />
13+
<SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#72767d" />
14+
<SolidColorBrush x:Key="SearchIconForeground" Color="#d3d3d3" />
15+
<SolidColorBrush x:Key="SeparatorForeground" Color="#eaeaea" />
16+
<SolidColorBrush x:Key="ThumbColor" Color="#868686" />
17+
<SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
18+
<SolidColorBrush x:Key="HotkeyForeground" Color="#acacac" />
19+
<SolidColorBrush x:Key="HotkeySelectedForeground" Color="#acacac" />
20+
<Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
21+
922
<SolidColorBrush x:Key="Color00B" Color="#fbfbfb" />
1023
<SolidColorBrush x:Key="Color01B" Color="#f3f3f3" />
1124
<SolidColorBrush x:Key="Color02B" Color="#ffffff" />

‎Flow.Launcher/Themes/Win11Dark.xaml

Lines changed: 90 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,109 @@
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>
7-
<Style x:Key="ItemGlyph" BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}">
8+
<Style
9+
x:Key="ItemGlyph"
10+
BasedOn="{StaticResource BaseGlyphStyle}"
11+
TargetType="{x:Type TextBlock}">
812
<Setter Property="Foreground" Value="#ffffff" />
913
</Style>
10-
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
11-
<Setter Property="SelectionBrush" Value="#4a5459"/>
14+
<Style
15+
x:Key="QueryBoxStyle"
16+
BasedOn="{StaticResource BaseQueryBoxStyle}"
17+
TargetType="{x:Type TextBox}">
18+
<Setter Property="SelectionBrush" Value="#4a5459" />
1219
<Setter Property="FontSize" Value="24" />
1320
<Setter Property="Background" Value="#202020" />
1421
<Setter Property="Foreground" Value="#FFFFFF" />
1522
<Setter Property="CaretBrush" Value="#FFFFFF" />
1623
<Setter Property="FontSize" Value="26" />
17-
<Setter Property="Padding" Value="0 4 66 0" />
24+
<Setter Property="Padding" Value="0,4,66,0" />
1825
<Setter Property="Height" Value="42" />
1926
</Style>
20-
<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}">
2131
<Setter Property="Background" Value="#202020" />
2232
<Setter Property="Foreground" Value="#7b7b7b" />
2333
<Setter Property="FontSize" Value="26" />
24-
<Setter Property="Padding" Value="0 4 66 0" />
34+
<Setter Property="Padding" Value="0,4,66,0" />
2535
<Setter Property="Height" Value="42" />
2636
</Style>
27-
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
37+
<Style
38+
x:Key="WindowBorderStyle"
39+
BasedOn="{StaticResource BaseWindowBorderStyle}"
40+
TargetType="{x:Type Border}">
2841
<Setter Property="BorderThickness" Value="1" />
2942
<Setter Property="BorderBrush" Value="#3f3f3f" />
3043
<Setter Property="CornerRadius" Value="5" />
3144
<Setter Property="Background" Value="#202020" />
3245
</Style>
33-
<Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
46+
<Style
47+
x:Key="WindowStyle"
48+
BasedOn="{StaticResource BaseWindowStyle}"
49+
TargetType="{x:Type Window}">
3450
<Setter Property="Width" Value="576" />
35-
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
51+
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
3652
</Style>
3753

38-
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
54+
<Style
55+
x:Key="PendingLineStyle"
56+
BasedOn="{StaticResource BasePendingLineStyle}"
57+
TargetType="{x:Type Line}">
3958
<Setter Property="Stroke" Value="White" />
4059
</Style>
4160

42-
<!-- Item Style -->
43-
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
61+
<!-- Item Style -->
62+
<Style
63+
x:Key="ItemTitleStyle"
64+
BasedOn="{StaticResource BaseItemTitleStyle}"
65+
TargetType="{x:Type TextBlock}">
4466
<Setter Property="Foreground" Value="#ffffff" />
4567
</Style>
46-
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
68+
<Style
69+
x:Key="ItemSubTitleStyle"
70+
BasedOn="{StaticResource BaseItemSubTitleStyle}"
71+
TargetType="{x:Type TextBlock}">
4772
<Setter Property="Foreground" Value="#7b7b7b" />
4873
<Setter Property="FontSize" Value="13" />
4974
<Setter Property="FontWeight" Value="Regular" />
5075
</Style>
51-
<Style x:Key="ItemNumberStyle" BasedOn="{StaticResource BaseItemNumberStyle}" TargetType="{x:Type TextBlock}">
76+
<Style
77+
x:Key="ItemNumberStyle"
78+
BasedOn="{StaticResource BaseItemNumberStyle}"
79+
TargetType="{x:Type TextBlock}">
5280
<Setter Property="Foreground" Value="#ffffff" />
5381
</Style>
54-
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
82+
<Style
83+
x:Key="ItemTitleSelectedStyle"
84+
BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
85+
TargetType="{x:Type TextBlock}">
5586
<Setter Property="Cursor" Value="Arrow" />
5687
<Setter Property="Foreground" Value="#ffffff" />
5788
</Style>
58-
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
89+
<Style
90+
x:Key="ItemSubTitleSelectedStyle"
91+
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
92+
TargetType="{x:Type TextBlock}">
5993
<Setter Property="Cursor" Value="Arrow" />
6094
<Setter Property="Foreground" Value="#7b7b7b" />
6195
<Setter Property="FontSize" Value="13" />
6296
<Setter Property="FontWeight" Value="Regular" />
6397
</Style>
64-
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#2d2d2d</SolidColorBrush>
65-
<Style x:Key="ItemImageSelectedStyle" BasedOn="{StaticResource BaseItemImageSelectedStyle}" TargetType="{x:Type Image}" >
98+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#198F8F8F</SolidColorBrush>
99+
<Style
100+
x:Key="ItemImageSelectedStyle"
101+
BasedOn="{StaticResource BaseItemImageSelectedStyle}"
102+
TargetType="{x:Type Image}">
66103
<Setter Property="Cursor" Value="Arrow" />
67104
</Style>
68105
<Style x:Key="HighlightStyle">
69-
<Setter Property="Inline.FontWeight" Value="Bold" />
106+
<Setter Property="Inline.Foreground" Value="#0078d7" />
70107
</Style>
71108
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
72109
<Setter Property="FontSize" Value="13" />
@@ -76,29 +113,45 @@
76113
<Setter Property="FontSize" Value="13" />
77114
<Setter Property="Foreground" Value="#7b7b7b" />
78115
</Style>
79-
<!-- button style in the middle of the scrollbar -->
80-
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
81-
<Setter Property="SnapsToDevicePixels" Value="True"/>
82-
<Setter Property="OverridesDefaultStyle" Value="true"/>
83-
<Setter Property="IsTabStop" Value="false"/>
84-
<Setter Property="Width" Value="2"/>
85-
<Setter Property="Focusable" Value="false"/>
116+
<!-- button style in the middle of the scrollbar -->
117+
<Style
118+
x:Key="ThumbStyle"
119+
BasedOn="{StaticResource BaseThumbStyle}"
120+
TargetType="{x:Type Thumb}">
121+
<Setter Property="SnapsToDevicePixels" Value="True" />
122+
<Setter Property="OverridesDefaultStyle" Value="true" />
123+
<Setter Property="IsTabStop" Value="false" />
124+
<Setter Property="Width" Value="2" />
125+
<Setter Property="Focusable" Value="false" />
86126
<Setter Property="Template">
87127
<Setter.Value>
88128
<ControlTemplate TargetType="{x:Type Thumb}">
89-
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#9a9a9a" BorderBrush="Transparent" BorderThickness="0" />
129+
<Border
130+
Background="#9a9a9a"
131+
BorderBrush="Transparent"
132+
BorderThickness="0"
133+
CornerRadius="2"
134+
DockPanel.Dock="Right" />
90135
</ControlTemplate>
91136
</Setter.Value>
92137
</Setter>
93138
</Style>
94-
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
95-
</Style>
96-
<Style x:Key="SeparatorStyle" BasedOn="{StaticResource BaseSeparatorStyle}" TargetType="{x:Type Rectangle}">
97-
<Setter Property="Fill" Value="#4d4d4d"/>
98-
<Setter Property="Height" Value="1"/>
99-
<Setter Property="Margin" Value="12 0 12 8"/>
139+
<Style
140+
x:Key="ScrollBarStyle"
141+
BasedOn="{StaticResource BaseScrollBarStyle}"
142+
TargetType="{x:Type ScrollBar}" />
143+
<Style
144+
x:Key="SeparatorStyle"
145+
BasedOn="{StaticResource BaseSeparatorStyle}"
146+
TargetType="{x:Type Rectangle}">
147+
<Setter Property="Fill" Value="#4d4d4d" />
148+
<Setter Property="Height" Value="1" />
149+
<Setter Property="Margin" Value="12,0,12,8" />
100150
</Style>
101-
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
151+
<Style
152+
x:Key="SearchIconStyle"
153+
BasedOn="{StaticResource BaseSearchIconStyle}"
154+
TargetType="{x:Type Path}">
102155
<Setter Property="Fill" Value="#4d4d4d" />
103156
<Setter Property="Width" Value="32" />
104157
<Setter Property="Height" Value="32" />

‎Flow.Launcher/Themes/Win11Light.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<Setter Property="Cursor" Value="Arrow" />
5858
<Setter Property="Foreground" Value="#72767d" />
5959
</Style>
60-
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#eaeaea</SolidColorBrush>
60+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#198F8F8F</SolidColorBrush>
6161
<Style x:Key="ItemImageSelectedStyle" BasedOn="{StaticResource BaseItemImageSelectedStyle}" TargetType="{x:Type Image}" >
6262
<Setter Property="Cursor" Value="Arrow" />
6363
</Style>

0 commit comments

Comments
 (0)