Skip to content

Commit f07c09f

Browse files
onesoundsonesounds
authored
Merge pull request #3394 from onesounds/050328-NewHotkeyDesign
Adjust Hotkey Design
2 parents be966b7 + ebb1125 commit f07c09f

21 files changed

+248
-149
lines changed

‎Flow.Launcher/Resources/Dark.xaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
<SolidColorBrush x:Key="BasicSeparatorColor" Color="#cecece" />
5959
<SolidColorBrush x:Key="BasicLineColor" Color="#cecece" />
6060

61+
<SolidColorBrush x:Key="NewHotkeyForeground" Color="#44FFFFFF" />
62+
<SolidColorBrush x:Key="BasicHotkeyBGColor" Color="#13FFFFFF" />
63+
6164
<SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
6265
<SolidColorBrush x:Key="PopuBGColor" Color="#202020" />
6366
<SolidColorBrush x:Key="PopupBGColor" Color="#202020" />
@@ -115,7 +118,7 @@
115118
<SolidColorBrush x:Key="InfoBarWarningIcon" Color="#FCE100" />
116119
<SolidColorBrush x:Key="InfoBarWarningBG" Color="#433519" />
117120
<SolidColorBrush x:Key="InfoBarBD" Color="#19000000" />
118-
121+
119122
<SolidColorBrush x:Key="MouseOverWindowCloseButtonForegroundBrush" Color="#ffffff" />
120123

121124
<SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />

‎Flow.Launcher/Resources/Light.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<SolidColorBrush x:Key="PluginInfoColor" Color="#8f8f8f" />
5252
<SolidColorBrush x:Key="BasicLabelColor" Color="#1b1b1b" />
5353

54+
<SolidColorBrush x:Key="NewHotkeyForeground" Color="#5E000000" />
55+
<SolidColorBrush x:Key="BasicHotkeyBGColor" Color="#0A000000" />
56+
5457
<SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
5558
<!-- Typo -->
5659
<SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />

‎Flow.Launcher/ResultListBox.xaml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,24 @@
6565
Margin="0 0 10 0"
6666
VerticalAlignment="Center"
6767
Visibility="{Binding ShowOpenResultHotkey}">
68-
<TextBlock
69-
x:Name="Hotkey"
70-
Margin="12 0 12 0"
71-
Padding="0 0 0 0"
72-
HorizontalAlignment="Right"
73-
VerticalAlignment="Center"
74-
Style="{DynamicResource ItemHotkeyStyle}">
75-
<TextBlock.Visibility>
68+
<Border x:Name="HotkeyBG" Style="{DynamicResource ItemHotkeyBGStyle}">
69+
<Border.Visibility>
7670
<Binding Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
77-
</TextBlock.Visibility>
78-
<TextBlock.Text>
79-
<MultiBinding StringFormat="{}{0}+{1}">
80-
<Binding Path="OpenResultModifiers" />
81-
<Binding Converter="{StaticResource ResourceKey=OrdinalConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
82-
</MultiBinding>
83-
</TextBlock.Text>
84-
</TextBlock>
71+
</Border.Visibility>
72+
<TextBlock
73+
x:Name="Hotkey"
74+
Padding="0 0 0 0"
75+
HorizontalAlignment="Right"
76+
VerticalAlignment="Center"
77+
Style="{DynamicResource ItemHotkeyStyle}">
78+
<TextBlock.Text>
79+
<MultiBinding StringFormat="{}{0}+{1}">
80+
<Binding Path="OpenResultModifiers" />
81+
<Binding Converter="{StaticResource ResourceKey=OrdinalConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
82+
</MultiBinding>
83+
</TextBlock.Text>
84+
</TextBlock>
85+
</Border>
8586
</StackPanel>
8687

8788
<Grid Grid.Column="0">
@@ -214,6 +215,7 @@
214215
<Setter TargetName="Title" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
215216
<Setter TargetName="SubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}" />
216217
<Setter TargetName="Hotkey" Property="Style" Value="{DynamicResource ItemHotkeySelectedStyle}" />
218+
<Setter TargetName="HotkeyBG" Property="Style" Value="{DynamicResource ItemHotkeyBGSelectedStyle}" />
217219
<Setter TargetName="GlyphIcon" Property="Style" Value="{DynamicResource ItemGlyphSelectedStyle}" />
218220
</DataTrigger>
219221
</DataTemplate.Triggers>

‎Flow.Launcher/Themes/Base.xaml

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,17 +351,41 @@
351351
<Setter Property="Inline.FontWeight" Value="Bold" />
352352
</Style>
353353
<Style x:Key="BaseItemHotkeyStyle" TargetType="{x:Type TextBlock}">
354-
<Setter Property="FontSize" Value="15" />
354+
<Setter Property="FontSize" Value="12" />
355355
<Setter Property="Foreground" Value="#8f8f8f" />
356356
</Style>
357357
<Style x:Key="BaseItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
358-
<Setter Property="FontSize" Value="15" />
358+
<Setter Property="FontSize" Value="12" />
359359
<Setter Property="Foreground" Value="#8f8f8f" />
360360
</Style>
361+
<Style x:Key="BaseItemHotkeyBGStyle" TargetType="{x:Type Border}">
362+
<Setter Property="Margin" Value="12 0 12 0" />
363+
<Setter Property="Padding" Value="6 4 6 4" />
364+
<Setter Property="Background" Value="#138A8A8A" />
365+
<Setter Property="CornerRadius" Value="4" />
366+
</Style>
367+
<Style x:Key="BaseItemHotkeyBGSelectedStyle" TargetType="{x:Type Border}">
368+
<Setter Property="Margin" Value="12 0 12 0" />
369+
<Setter Property="Padding" Value="6 4 6 4" />
370+
<Setter Property="CornerRadius" Value="4" />
371+
<Setter Property="Background" Value="#138A8A8A" />
372+
</Style>
373+
<Style
374+
x:Key="ItemHotkeyBGStyle"
375+
BasedOn="{StaticResource BaseItemHotkeyBGStyle}"
376+
TargetType="{x:Type Border}">
377+
<Setter Property="Margin" Value="12 0 12 0" />
378+
<Setter Property="Padding" Value="6 4 6 4" />
379+
<Setter Property="CornerRadius" Value="4" />
380+
</Style>
381+
<Style
382+
x:Key="ItemHotkeyBGSelectedStyle"
383+
BasedOn="{StaticResource BaseItemHotkeyBGSelectedStyle}"
384+
TargetType="{x:Type Border}" />
361385

362386
<!-- DO NOT USE THIS KEY. this key for themes with wrong typo. This key should be removed. Right key is BaseItemHotkeySelectedStyle. -->
363387
<Style x:Key="BaseItemHotkeySelecetedStyle" TargetType="{x:Type TextBlock}">
364-
<Setter Property="FontSize" Value="15" />
388+
<Setter Property="FontSize" Value="12" />
365389
<Setter Property="Foreground" Value="#8f8f8f" />
366390
</Style>
367391

@@ -488,15 +512,13 @@
488512
x:Key="ItemHotkeyStyle"
489513
BasedOn="{StaticResource BaseItemHotkeyStyle}"
490514
TargetType="{x:Type TextBlock}">
491-
<Setter Property="FontSize" Value="15" />
492515
<Setter Property="Foreground" Value="#8f8f8f" />
493516
<Setter Property="Opacity" Value="0.5" />
494517
</Style>
495518
<Style
496519
x:Key="ItemHotkeySelectedStyle"
497520
BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
498521
TargetType="{x:Type TextBlock}">
499-
<Setter Property="FontSize" Value="15" />
500522
<Setter Property="Foreground" Value="#8f8f8f" />
501523
<Setter Property="Opacity" Value="0.5" />
502524
</Style>

‎Flow.Launcher/Themes/BlurBlack Darker.xaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<system:String x:Key="SystemBG">Dark</system:String>
1616
<Color x:Key="LightBG">#C7000000</Color>
1717
<Color x:Key="DarkBG">#C7000000</Color>
18+
<Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
1819

1920
<Style x:Key="WindowRadius" TargetType="{x:Type Border}">
2021
<Setter Property="CornerRadius" Value="0" />
@@ -145,13 +146,17 @@
145146
<Setter Property="Height" Value="30" />
146147
<Setter Property="Opacity" Value="0.2" />
147148
</Style>
148-
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
149-
<Setter Property="FontSize" Value="14" />
149+
<Style
150+
x:Key="ItemHotkeyStyle"
151+
BasedOn="{StaticResource BaseItemHotkeyStyle}"
152+
TargetType="{x:Type TextBlock}">
150153
<Setter Property="Foreground" Value="#ffffff" />
151154
<Setter Property="Opacity" Value="0.2" />
152155
</Style>
153-
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
154-
<Setter Property="FontSize" Value="14" />
156+
<Style
157+
x:Key="ItemHotkeySelectedStyle"
158+
BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
159+
TargetType="{x:Type TextBlock}">
155160
<Setter Property="Foreground" Value="#ffffff" />
156161
<Setter Property="Opacity" Value="0.2" />
157162
</Style>

‎Flow.Launcher/Themes/BlurBlack.xaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<system:String x:Key="SystemBG">Dark</system:String>
1515
<Color x:Key="LightBG">#B0000000</Color>
1616
<Color x:Key="DarkBG">#B6000000</Color>
17+
<Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
1718

1819
<Style x:Key="WindowRadius" TargetType="{x:Type Border}">
1920
<Setter Property="CornerRadius" Value="0" />
@@ -142,13 +143,17 @@
142143
<Setter Property="Height" Value="30" />
143144
<Setter Property="Opacity" Value="0.5" />
144145
</Style>
145-
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
146-
<Setter Property="FontSize" Value="14" />
146+
<Style
147+
x:Key="ItemHotkeyStyle"
148+
BasedOn="{StaticResource BaseItemHotkeyStyle}"
149+
TargetType="{x:Type TextBlock}">
147150
<Setter Property="Foreground" Value="#ffffff" />
148151
<Setter Property="Opacity" Value="0.5" />
149152
</Style>
150-
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
151-
<Setter Property="FontSize" Value="14" />
153+
<Style
154+
x:Key="ItemHotkeySelectedStyle"
155+
BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
156+
TargetType="{x:Type TextBlock}">
152157
<Setter Property="Foreground" Value="#ffffff" />
153158
<Setter Property="Opacity" Value="0.5" />
154159
</Style>

‎Flow.Launcher/Themes/BlurWhite.xaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<system:String x:Key="SystemBG">Light</system:String>
1515
<Color x:Key="LightBG">#BFFAFAFA</Color>
1616
<Color x:Key="DarkBG">#BFFAFAFA</Color>
17+
<Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
18+
1719
<Style
1820
x:Key="ItemGlyph"
1921
BasedOn="{StaticResource BaseGlyphStyle}"
@@ -148,13 +150,17 @@
148150
<Setter Property="Height" Value="30" />
149151
<Setter Property="Opacity" Value="0.2" />
150152
</Style>
151-
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
152-
<Setter Property="FontSize" Value="14" />
153+
<Style
154+
x:Key="ItemHotkeyStyle"
155+
BasedOn="{StaticResource BaseItemHotkeyStyle}"
156+
TargetType="{x:Type TextBlock}">
153157
<Setter Property="Foreground" Value="#000000" />
154158
<Setter Property="Opacity" Value="0.2" />
155159
</Style>
156-
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
157-
<Setter Property="FontSize" Value="14" />
160+
<Style
161+
x:Key="ItemHotkeySelectedStyle"
162+
BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
163+
TargetType="{x:Type TextBlock}">
158164
<Setter Property="Foreground" Value="#000000" />
159165
<Setter Property="Opacity" Value="0.2" />
160166
</Style>

‎Flow.Launcher/Themes/Circle System.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
x:Key="QueryBoxStyle"
2727
BasedOn="{StaticResource BaseQueryBoxStyle}"
2828
TargetType="{x:Type TextBox}">
29-
<Setter Property="Padding" Value="0 4 50 0" />
29+
<Setter Property="Padding" Value="0 0 50 0" />
3030
<Setter Property="Foreground" Value="{m:DynamicColor SystemControlHighlightBaseHighBrush}" />
3131
<Setter Property="FontSize" Value="18" />
3232
<Setter Property="Height" Value="38" />
@@ -36,7 +36,7 @@
3636
x:Key="QuerySuggestionBoxStyle"
3737
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
3838
TargetType="{x:Type TextBox}">
39-
<Setter Property="Padding" Value="0 4 50 0" />
39+
<Setter Property="Padding" Value="0 0 50 0" />
4040
<Setter Property="Background" Value="Transparent" />
4141
<Setter Property="Height" Value="38" />
4242
<Setter Property="FontSize" Value="18" />

‎Flow.Launcher/Themes/Cyan Dark.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
x:Key="QueryBoxStyle"
3434
BasedOn="{StaticResource BaseQueryBoxStyle}"
3535
TargetType="{x:Type TextBox}">
36-
<Setter Property="Padding" Value="0,4,50,0" />
36+
<Setter Property="Padding" Value="0,0,50,0" />
3737
<Setter Property="CaretBrush" Value="#336766" />
3838
<Setter Property="Foreground" Value="#e7e9eb" />
3939
<Setter Property="FontSize" Value="18" />
@@ -44,7 +44,7 @@
4444
x:Key="QuerySuggestionBoxStyle"
4545
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
4646
TargetType="{x:Type TextBox}">
47-
<Setter Property="Padding" Value="0,4,50,0" />
47+
<Setter Property="Padding" Value="0,0,50,0" />
4848
<Setter Property="Background" Value="Transparent" />
4949
<Setter Property="Height" Value="38" />
5050
<Setter Property="FontSize" Value="18" />
@@ -56,7 +56,7 @@
5656
BasedOn="{StaticResource BaseWindowBorderStyle}"
5757
TargetType="{x:Type Border}">
5858
<Setter Property="BorderThickness" Value="1" />
59-
<Setter Property="BorderBrush" Value="#09181e" />
59+
<Setter Property="BorderBrush" Value="#1e292f" />
6060
<Setter Property="Background" Value="#0f1f26" />
6161
<Setter Property="CornerRadius" Value="6" />
6262
<Setter Property="UseLayoutRounding" Value="True" />

0 commit comments

Comments
 (0)