Results: Remove hotkey rectangle

TBM13 · TBM13 · commit cd4ea6bb2626 · 2025-08-27T23:13:00.000-03:00
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
@@ -155,9 +155,7 @@ private void ApplyFontSettings(ResourceDictionary dict)
             }
 
             if (dict["ItemTitleStyle"] is Style resultItemStyle &&
-                dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle &&
-                dict["ItemHotkeyStyle"] is Style resultHotkeyItemStyle &&
-                dict["ItemHotkeySelectedStyle"] is Style resultHotkeyItemSelectedStyle)
+                dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle)
             {
                 var fontFamily = new FontFamily(_settings.ResultFont);
                 var fontStyle = FontHelper.GetFontStyleFromInvariantStringOrNormal(_settings.ResultFontStyle);
@@ -166,8 +164,6 @@ private void ApplyFontSettings(ResourceDictionary dict)
 
                 SetFontProperties(resultItemStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
                 SetFontProperties(resultItemSelectedStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
-                SetFontProperties(resultHotkeyItemStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
-                SetFontProperties(resultHotkeyItemSelectedStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);
             }
 
             if (dict["ItemSubTitleStyle"] is Style resultSubItemStyle &&
@@ -285,9 +281,7 @@ private ResourceDictionary GetResourceDictionary(string theme)
             }
 
             if (dict["ItemTitleStyle"] is Style resultItemStyle &&
-                dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle &&
-                dict["ItemHotkeyStyle"] is Style resultHotkeyItemStyle &&
-                dict["ItemHotkeySelectedStyle"] is Style resultHotkeyItemSelectedStyle)
+                dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle)
             {
                 Setter fontFamily = new Setter(TextBlock.FontFamilyProperty, new FontFamily(_settings.ResultFont));
                 Setter fontStyle = new Setter(TextBlock.FontStyleProperty, FontHelper.GetFontStyleFromInvariantStringOrNormal(_settings.ResultFontStyle));
@@ -296,7 +290,7 @@ private ResourceDictionary GetResourceDictionary(string theme)
 
                 Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
                 Array.ForEach(
-                    new[] { resultItemStyle, resultItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o
+                    new[] { resultItemStyle, resultItemSelectedStyle }, o
                     => Array.ForEach(setters, p => o.Setters.Add(p)));
             }
 
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
@@ -15,7 +15,6 @@
     <SolidColorBrush x:Key="ThumbColor" Color="#28F7F3FF" />
     <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
     <SolidColorBrush x:Key="HotkeyForeground" Color="#33FFFFFF" />
-    <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#33FFFFFF" />
     <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
 
     <SolidColorBrush x:Key="BasicSystemAccentColor" Color="{m:DynamicColor SystemAccentColorLight1}" />
@@ -57,9 +56,6 @@
     <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" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
@@ -15,7 +15,6 @@
     <SolidColorBrush x:Key="ThumbColor" Color="#1F000000" />
     <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
     <SolidColorBrush x:Key="HotkeyForeground" Color="#51000000" />
-    <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#51000000" />
     <Color x:Key="ItemSelectedBackgroundColorBrush">#7EFFFFFF</Color>
 
     <SolidColorBrush x:Key="BasicSystemAccentColor" Color="{m:DynamicColor SystemAccentColor}" />
@@ -51,9 +50,6 @@
     <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" />
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
@@ -47,36 +47,11 @@
                         UseLayoutRounding="False">
                         <Grid.Resources>
                             <converter:HighlightTextConverter x:Key="HighlightTextConverter" />
-                            <converter:OrdinalConverter x:Key="OrdinalConverter" />
-                            <converter:OpenResultHotkeyVisibilityConverter x:Key="OpenResultHotkeyVisibilityConverter" />
                         </Grid.Resources>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Style="{DynamicResource ImageAreaWidth}" />
                             <ColumnDefinition Width="9*" />
-                            <ColumnDefinition Width="Auto" MinWidth="8" />
                         </Grid.ColumnDefinitions>
-                        <Border
-                            x:Name="HotkeyBG"
-                            Grid.Column="2"
-                            VerticalAlignment="Center"
-                            Style="{DynamicResource ItemHotkeyBGStyle}">
-                            <Border.Visibility>
-                                <Binding Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
-                            </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 Mode="OneWay" Path="Settings.OpenResultModifiers" />
-                                        <Binding Converter="{StaticResource ResourceKey=OrdinalConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
-                                    </MultiBinding>
-                                </TextBlock.Text>
-                            </TextBlock>
-                        </Border>
 
                         <StackPanel
                             Grid.Column="0"
@@ -142,8 +117,6 @@
                 <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
                     <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}" />
                     <Setter TargetName="GlyphIcon" Property="Style" Value="{DynamicResource ItemGlyphSelectedStyle}" />
                 </DataTrigger>
             </DataTemplate.Triggers>
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
@@ -291,44 +291,6 @@
     <Style x:Key="HighlightStyle">
         <Setter Property="Inline.FontWeight" Value="Bold" />
     </Style>
-    <Style x:Key="BaseItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="#8f8f8f" />
-    </Style>
-    <Style x:Key="BaseItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <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 22 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 22 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 22 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="12" />
-        <Setter Property="Foreground" Value="#8f8f8f" />
-    </Style>
 
     <Style x:Key="BasePreviewBorderStyle" TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="1 0 0 0" />
@@ -403,20 +365,6 @@
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
-    <Style
-        x:Key="ItemHotkeyStyle"
-        BasedOn="{StaticResource BaseItemHotkeyStyle}"
-        TargetType="{x:Type TextBlock}">
-        <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="Foreground" Value="#8f8f8f" />
-        <Setter Property="Opacity" Value="0.5" />
-    </Style>
     <Style
         x:Key="ItemGlyphSelectedStyle"
         BasedOn="{StaticResource BaseGlyphSelectedStyle}"
diff --git a/Flow.Launcher/Themes/Win10System.xaml b/Flow.Launcher/Themes/Win10System.xaml
@@ -113,20 +113,6 @@
     <Style x:Key="HighlightStyle">
         <Setter Property="Inline.FontWeight" Value="SemiBold" />
     </Style>
-    <Style
-        x:Key="ItemHotkeyStyle"
-        BasedOn="{StaticResource BaseItemHotkeyStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="11" />
-        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
-    </Style>
-    <Style
-        x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="11" />
-        <Setter Property="Foreground" Value="{DynamicResource HotkeySelectedForeground}" />
-    </Style>
     <!--  button style in the middle of the scrollbar  -->
     <Style
         x:Key="ThumbStyle"
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
@@ -130,27 +130,6 @@
         BasedOn="{StaticResource BaseScrollBarStyle}"
         TargetType="{x:Type ScrollBar}" />
 
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="11" />
-        <Setter Property="Foreground" Value="{DynamicResource NewHotkeyForeground}" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="11" />
-        <Setter Property="Foreground" Value="{DynamicResource NewHotkeyForeground}" />
-    </Style>
-    <Style
-        x:Key="ItemHotkeyBGStyle"
-        BasedOn="{StaticResource BaseItemHotkeyBGStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="Background" Value="{DynamicResource BasicHotkeyBGColor}" />
-    </Style>
-    <Style
-        x:Key="ItemHotkeyBGSelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeyBGSelectedStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="Background" Value="{DynamicResource BasicHotkeyBGColor}" />
-    </Style>
-
     <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="VerticalAlignment" Value="Center" />

Original file line number	Diff line number	Diff line change
`@@ -155,9 +155,7 @@ private void ApplyFontSettings(ResourceDictionary dict)`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`if (dict["ItemTitleStyle"] is Style resultItemStyle &&`
`158`		`- dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle &&`
`159`		`- dict["ItemHotkeyStyle"] is Style resultHotkeyItemStyle &&`
`160`		`- dict["ItemHotkeySelectedStyle"] is Style resultHotkeyItemSelectedStyle)`
	`158`	`+ dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle)`
`161`	`159`	`{`
`162`	`160`	`var fontFamily = new FontFamily(_settings.ResultFont);`
`163`	`161`	`var fontStyle = FontHelper.GetFontStyleFromInvariantStringOrNormal(_settings.ResultFontStyle);`
`@@ -166,8 +164,6 @@ private void ApplyFontSettings(ResourceDictionary dict)`
`166`	`164`
`167`	`165`	`SetFontProperties(resultItemStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);`
`168`	`166`	`SetFontProperties(resultItemSelectedStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);`
`169`		`- SetFontProperties(resultHotkeyItemStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);`
`170`		`- SetFontProperties(resultHotkeyItemSelectedStyle, fontFamily, fontStyle, fontWeight, fontStretch, false);`
`171`	`167`	`}`
`172`	`168`
`173`	`169`	`if (dict["ItemSubTitleStyle"] is Style resultSubItemStyle &&`
`@@ -285,9 +281,7 @@ private ResourceDictionary GetResourceDictionary(string theme)`
`285`	`281`	`}`
`286`	`282`
`287`	`283`	`if (dict["ItemTitleStyle"] is Style resultItemStyle &&`
`288`		`- dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle &&`
`289`		`- dict["ItemHotkeyStyle"] is Style resultHotkeyItemStyle &&`
`290`		`- dict["ItemHotkeySelectedStyle"] is Style resultHotkeyItemSelectedStyle)`
	`284`	`+ dict["ItemTitleSelectedStyle"] is Style resultItemSelectedStyle)`
`291`	`285`	`{`
`292`	`286`	`Setter fontFamily = new Setter(TextBlock.FontFamilyProperty, new FontFamily(_settings.ResultFont));`
`293`	`287`	`Setter fontStyle = new Setter(TextBlock.FontStyleProperty, FontHelper.GetFontStyleFromInvariantStringOrNormal(_settings.ResultFontStyle));`
`@@ -296,7 +290,7 @@ private ResourceDictionary GetResourceDictionary(string theme)`
`296`	`290`
`297`	`291`	`Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };`
`298`	`292`	`Array.ForEach(`
`299`		`- new[] { resultItemStyle, resultItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o`
	`293`	`+ new[] { resultItemStyle, resultItemSelectedStyle }, o`
`300`	`294`	`=> Array.ForEach(setters, p => o.Setters.Add(p)));`
`301`	`295`	`}`
`302`	`296`