Skip to content

Adjust Hotkey Design #3394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 30, 2025
Merged

Adjust Hotkey Design #3394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
00c2119
Add Hotkey border style
onesounds Mar 27, 2025
398dfa5
Adjust Discord Theme
onesounds Mar 27, 2025
96ffd06
- Change Darker Glass theme
onesounds Mar 27, 2025
57bc886
- Add hotkey size baseon in blur themes
onesounds Mar 28, 2025
f72b700
Fix BasedOn Style
onesounds Mar 28, 2025
b4c790e
Add margin for classics
onesounds Mar 28, 2025
8d8719a
Merge branch 'dev' into 050328-NewHotkeyDesign
onesounds Mar 28, 2025
f8aee15
Adjust border color for cyan theme
onesounds Mar 28, 2025
20f2fec
Fix clockpanel basedon
onesounds Mar 28, 2025
870db70
Merge branch 'dev' into 050328-NewHotkeyDesign
onesounds Mar 29, 2025
9e11c9c
Adjust query padding
onesounds Mar 29, 2025
ebb1125
Merge branch 'dev' into 050328-NewHotkeyDesign
onesounds Mar 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Flow.Launcher/Resources/Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
<SolidColorBrush x:Key="BasicSeparatorColor" Color="#cecece" />
<SolidColorBrush x:Key="BasicLineColor" Color="#cecece" />

<SolidColorBrush x:Key="NewHotkeyForeground" Color="#44FFFFFF" />
<SolidColorBrush x:Key="BasicHotkeyBGColor" Color="#13FFFFFF" />

<SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
<SolidColorBrush x:Key="PopuBGColor" Color="#202020" />
<SolidColorBrush x:Key="PopupBGColor" Color="#202020" />
Expand Down Expand Up @@ -115,7 +118,7 @@
<SolidColorBrush x:Key="InfoBarWarningIcon" Color="#FCE100" />
<SolidColorBrush x:Key="InfoBarWarningBG" Color="#433519" />
<SolidColorBrush x:Key="InfoBarBD" Color="#19000000" />

<SolidColorBrush x:Key="MouseOverWindowCloseButtonForegroundBrush" Color="#ffffff" />

<SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
Expand Down
3 changes: 3 additions & 0 deletions Flow.Launcher/Resources/Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
<SolidColorBrush x:Key="PluginInfoColor" Color="#8f8f8f" />
<SolidColorBrush x:Key="BasicLabelColor" Color="#1b1b1b" />

<SolidColorBrush x:Key="NewHotkeyForeground" Color="#5E000000" />
<SolidColorBrush x:Key="BasicHotkeyBGColor" Color="#0A000000" />

<SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
<!-- Typo -->
<SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />
Expand Down
34 changes: 18 additions & 16 deletions Flow.Launcher/ResultListBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,24 @@
Margin="0 0 10 0"
VerticalAlignment="Center"
Visibility="{Binding ShowOpenResultHotkey}">
<TextBlock
x:Name="Hotkey"
Margin="12 0 12 0"
Padding="0 0 0 0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Style="{DynamicResource ItemHotkeyStyle}">
<TextBlock.Visibility>
<Border x:Name="HotkeyBG" Style="{DynamicResource ItemHotkeyBGStyle}">
<Border.Visibility>
<Binding Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
</TextBlock.Visibility>
<TextBlock.Text>
<MultiBinding StringFormat="{}{0}+{1}">
<Binding Path="OpenResultModifiers" />
<Binding Converter="{StaticResource ResourceKey=OrdinalConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</Border.Visibility>
<TextBlock
x:Name="Hotkey"
Padding="0 0 0 0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Style="{DynamicResource ItemHotkeyStyle}">
<TextBlock.Text>
<MultiBinding StringFormat="{}{0}+{1}">
<Binding Path="OpenResultModifiers" />
<Binding Converter="{StaticResource ResourceKey=OrdinalConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</Border>
</StackPanel>

<Grid Grid.Column="0">
Expand Down Expand Up @@ -214,6 +215,7 @@
<Setter TargetName="Title" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
<Setter TargetName="SubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}" />
<Setter TargetName="Hotkey" Property="Style" Value="{DynamicResource ItemHotkeySelectedStyle}" />
<Setter TargetName="HotkeyBG" Property="Style" Value="{DynamicResource ItemHotkeyBGSelectedStyle}" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh do we really need this? And the x:Name for the border🤔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is okay here. the hotkey of the selected item will have a slight difference.

image

<Setter TargetName="GlyphIcon" Property="Style" Value="{DynamicResource ItemGlyphSelectedStyle}" />
</DataTrigger>
</DataTemplate.Triggers>
Expand Down
32 changes: 27 additions & 5 deletions Flow.Launcher/Themes/Base.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,17 +351,41 @@
<Setter Property="Inline.FontWeight" Value="Bold" />
</Style>
<Style x:Key="BaseItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="15" />
<Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="#8f8f8f" />
</Style>
<Style x:Key="BaseItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="15" />
<Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="#8f8f8f" />
</Style>
<Style x:Key="BaseItemHotkeyBGStyle" TargetType="{x:Type Border}">
<Setter Property="Margin" Value="12 0 12 0" />
<Setter Property="Padding" Value="6 4 6 4" />
<Setter Property="Background" Value="#138A8A8A" />
<Setter Property="CornerRadius" Value="4" />
</Style>
<Style x:Key="BaseItemHotkeyBGSelectedStyle" TargetType="{x:Type Border}">
<Setter Property="Margin" Value="12 0 12 0" />
<Setter Property="Padding" Value="6 4 6 4" />
<Setter Property="CornerRadius" Value="4" />
<Setter Property="Background" Value="#138A8A8A" />
</Style>
<Style
x:Key="ItemHotkeyBGStyle"
BasedOn="{StaticResource BaseItemHotkeyBGStyle}"
TargetType="{x:Type Border}">
<Setter Property="Margin" Value="12 0 12 0" />
<Setter Property="Padding" Value="6 4 6 4" />
<Setter Property="CornerRadius" Value="4" />
</Style>
<Style
x:Key="ItemHotkeyBGSelectedStyle"
BasedOn="{StaticResource BaseItemHotkeyBGSelectedStyle}"
TargetType="{x:Type Border}" />

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

Expand Down Expand Up @@ -488,15 +512,13 @@
x:Key="ItemHotkeyStyle"
BasedOn="{StaticResource BaseItemHotkeyStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="15" />
<Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="Opacity" Value="0.5" />
</Style>
<Style
x:Key="ItemHotkeySelectedStyle"
BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="15" />
<Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="Opacity" Value="0.5" />
</Style>
Expand Down
13 changes: 9 additions & 4 deletions Flow.Launcher/Themes/BlurBlack Darker.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<system:String x:Key="SystemBG">Dark</system:String>
<Color x:Key="LightBG">#C7000000</Color>
<Color x:Key="DarkBG">#C7000000</Color>
<Thickness x:Key="ResultMargin">0 0 0 8</Thickness>

<Style x:Key="WindowRadius" TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="0" />
Expand Down Expand Up @@ -145,13 +146,17 @@
<Setter Property="Height" Value="30" />
<Setter Property="Opacity" Value="0.2" />
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" />
<Style
x:Key="ItemHotkeyStyle"
BasedOn="{StaticResource BaseItemHotkeyStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
<Setter Property="Opacity" Value="0.2" />
</Style>
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" />
<Style
x:Key="ItemHotkeySelectedStyle"
BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
<Setter Property="Opacity" Value="0.2" />
</Style>
Expand Down
13 changes: 9 additions & 4 deletions Flow.Launcher/Themes/BlurBlack.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<system:String x:Key="SystemBG">Dark</system:String>
<Color x:Key="LightBG">#B0000000</Color>
<Color x:Key="DarkBG">#B6000000</Color>
<Thickness x:Key="ResultMargin">0 0 0 8</Thickness>

<Style x:Key="WindowRadius" TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="0" />
Expand Down Expand Up @@ -142,13 +143,17 @@
<Setter Property="Height" Value="30" />
<Setter Property="Opacity" Value="0.5" />
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" />
<Style
x:Key="ItemHotkeyStyle"
BasedOn="{StaticResource BaseItemHotkeyStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
<Setter Property="Opacity" Value="0.5" />
</Style>
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" />
<Style
x:Key="ItemHotkeySelectedStyle"
BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
<Setter Property="Opacity" Value="0.5" />
</Style>
Expand Down
14 changes: 10 additions & 4 deletions Flow.Launcher/Themes/BlurWhite.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<system:String x:Key="SystemBG">Light</system:String>
<Color x:Key="LightBG">#BFFAFAFA</Color>
<Color x:Key="DarkBG">#BFFAFAFA</Color>
<Thickness x:Key="ResultMargin">0 0 0 8</Thickness>

<Style
x:Key="ItemGlyph"
BasedOn="{StaticResource BaseGlyphStyle}"
Expand Down Expand Up @@ -148,13 +150,17 @@
<Setter Property="Height" Value="30" />
<Setter Property="Opacity" Value="0.2" />
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" />
<Style
x:Key="ItemHotkeyStyle"
BasedOn="{StaticResource BaseItemHotkeyStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" />
<Setter Property="Opacity" Value="0.2" />
</Style>
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" />
<Style
x:Key="ItemHotkeySelectedStyle"
BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" />
<Setter Property="Opacity" Value="0.2" />
</Style>
Expand Down
4 changes: 2 additions & 2 deletions Flow.Launcher/Themes/Circle System.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
x:Key="QueryBoxStyle"
BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Padding" Value="0 4 50 0" />
<Setter Property="Padding" Value="0 0 50 0" />
<Setter Property="Foreground" Value="{m:DynamicColor SystemControlHighlightBaseHighBrush}" />
<Setter Property="FontSize" Value="18" />
<Setter Property="Height" Value="38" />
Expand All @@ -36,7 +36,7 @@
x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Padding" Value="0 4 50 0" />
<Setter Property="Padding" Value="0 0 50 0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Height" Value="38" />
<Setter Property="FontSize" Value="18" />
Expand Down
6 changes: 3 additions & 3 deletions Flow.Launcher/Themes/Cyan Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
x:Key="QueryBoxStyle"
BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Padding" Value="0,4,50,0" />
<Setter Property="Padding" Value="0,0,50,0" />
<Setter Property="CaretBrush" Value="#336766" />
<Setter Property="Foreground" Value="#e7e9eb" />
<Setter Property="FontSize" Value="18" />
Expand All @@ -44,7 +44,7 @@
x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Padding" Value="0,4,50,0" />
<Setter Property="Padding" Value="0,0,50,0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Height" Value="38" />
<Setter Property="FontSize" Value="18" />
Expand All @@ -56,7 +56,7 @@
BasedOn="{StaticResource BaseWindowBorderStyle}"
TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="#09181e" />
<Setter Property="BorderBrush" Value="#1e292f" />
<Setter Property="Background" Value="#0f1f26" />
<Setter Property="CornerRadius" Value="6" />
<Setter Property="UseLayoutRounding" Value="True" />
Expand Down
Loading
Loading