From 00c21199184551588ef4f2ade31f3c63c40033b2 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 28 Mar 2025 04:10:47 +0900
Subject: [PATCH] Add Hotkey border style

---
 Flow.Launcher/ResultListBox.xaml     | 33 ++++++++++++++--------------
 Flow.Launcher/Themes/Base.xaml       | 10 +++++++--
 Flow.Launcher/Themes/Win11Light.xaml |  4 ++--
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index e26340c4f..67ba9e391 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -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">
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 3756e7d27..b292657e6 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -351,13 +351,19 @@
         <Setter Property="Inline.FontWeight" Value="Bold" />
     </Style>
     <Style x:Key="BaseItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
+        <Setter Property="FontSize" Value="10" />
         <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
     <Style x:Key="BaseItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
+        <Setter Property="FontSize" Value="10" />
         <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
+    <Style x:Key="ItemHotkeyBGStyle" 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>
 
     <!--  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}">
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index b6f9cc249..2bc29bc80 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -156,11 +156,11 @@
     </Style>
 
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
+        <Setter Property="FontSize" Value="10" />
         <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
     </Style>
     <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
+        <Setter Property="FontSize" Value="10" />
         <Setter Property="Foreground" Value="{DynamicResource HotkeySelectedForeground}" />
     </Style>
     <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">