- Move some value to base.xaml

- Adjust themes

Author: onesounds

Flow.Launcher/ResultListBox.xaml

@@ -174,8 +174,6 @@
                             <TextBlock
                                 x:Name="Title"
                                 Grid.Row="0"
-                                Margin="0 0 0 1"
-                                VerticalAlignment="Bottom"
                                 DockPanel.Dock="Left"
                                 FontSize="{Binding Settings.ResultItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 IsEnabled="False"
@@ -194,8 +192,6 @@
                             <TextBlock
                                 x:Name="SubTitle"
                                 Grid.Row="1"
-                                Margin="0 1 0 0"
-                                VerticalAlignment="Top"
                                 FontSize="{Binding Settings.ResultSubItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 IsEnabled="False"
                                 Style="{DynamicResource ItemSubTitleStyle}"

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

@@ -378,7 +378,7 @@
                                 </Border>
                             </Border>
                             <Border
-                                Margin="0 0 0 20"
+                                Margin="0 0 0 30"
                                 Padding="8 4 8 4"
                                 HorizontalAlignment="Center"
                                 Background="#89000000"

Flow.Launcher/Themes/Base.xaml

@@ -180,9 +180,13 @@
     <Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
+        <Setter Property="Margin" Value="0 0 0 1" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
     </Style>
     <Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#D9D9D4" />
+        <Setter Property="Margin" Value="0 1 0 0" />
+        <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="FontSize" Value="13" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=SubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
@@ -215,10 +219,14 @@
     <Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
+        <Setter Property="Margin" Value="0 0 0 1" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
     </Style>
     <Style x:Key="BaseItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#D9D9D4" />
         <Setter Property="FontSize" Value="13" />
+        <Setter Property="Margin" Value="0 1 0 0" />
+        <Setter Property="VerticalAlignment" Value="Top" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=SubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
                 <Setter Property="Height" Value="0" />

Flow.Launcher/Themes/SlimLight.xaml

@@ -11,23 +11,23 @@
         <Setter Property="Width" Value="46" />
     </Style>
     <Style x:Key="ImageIconStyle" TargetType="{x:Type Image}">
-        <Setter Property="Height" Value="24" />
-        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="20" />
+        <Setter Property="Width" Value="20" />
     </Style>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Width" Value="24" />
-        <Setter Property="Height" Value="24" />
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="Width" Value="20" />
+        <Setter Property="Height" Value="20" />
         <Setter Property="Foreground" Value="#100f0f" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Padding" Value="0,0,42,0" />
+        <Setter Property="Padding" Value="0 0 42 0" />
         <Setter Property="Foreground" Value="#282728" />
         <Setter Property="FontSize" Value="16" />
         <Setter Property="Height" Value="24" />
@@ -37,7 +37,7 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Padding" Value="0,0,42,0" />
+        <Setter Property="Padding" Value="0 0 42 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="24" />
         <Setter Property="FontSize" Value="16" />
@@ -50,7 +50,7 @@
         TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="BorderBrush" Value="#bcbabd" />
-        <Setter Property="Background" Value="#edebee" />
+        <Setter Property="Background" Value="#FAFAFA" />
         <Setter Property="CornerRadius" Value="6" />
         <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
@@ -68,13 +68,15 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
+        <Setter Property="Margin" Value="0" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="#100f0f" />
     </Style>
     <Style
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
+        <Setter Property="Margin" Value="0" />
         <Setter Property="FontSize" Value="10" />
         <Setter Property="Foreground" Value="#8f8d90" />
     </Style>
@@ -84,21 +86,23 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="#dedcde" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="0,0,0,4" />
+        <Setter Property="Margin" Value="0 0 0 4" />
     </Style>
     <Style x:Key="HighlightStyle" />
     <Style
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
+        <Setter Property="Margin" Value="0" />
         <Setter Property="Foreground" Value="#100f0f" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="10" />
+        <Setter Property="Margin" Value="0" />
         <Setter Property="Foreground" Value="#8f8d90" />
     </Style>
     <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#d6d4d7</SolidColorBrush>
@@ -113,7 +117,7 @@
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
                         Width="4"
-                        Margin="0,0,2,0"
+                        Margin="0 0 2 0"
                         Background="#878687"
                         BorderBrush="Transparent"
                         BorderThickness="0"
@@ -136,33 +140,49 @@
         <Setter Property="Height" Value="24" />
     </Style>
     <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
-        <Setter Property="Background" Value="#edebee" />
         <Setter Property="Width" Value="24" />
         <Setter Property="Height" Value="24" />
-        <Setter Property="Margin" Value="0,0,8,0" />
+        <Setter Property="Margin" Value="0 0 8 0" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
     <Style x:Key="PluginActivationIcon" TargetType="{x:Type Image}">
         <Setter Property="Width" Value="24" />
         <Setter Property="Height" Value="24" />
-        <Setter Property="Margin" Value="0,0,8,0" />
+        <Setter Property="Margin" Value="0 0 8 0" />
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
+        <Setter Property="FontSize" Value="9" />
         <Setter Property="Foreground" Value="#8f8d90" />
     </Style>
     <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
+        <Setter Property="FontSize" Value="9" />
         <Setter Property="Foreground" Value="#8f8d90" />
     </Style>
+    <Style
+        x:Key="ItemHotkeyBGStyle"
+        BasedOn="{StaticResource BaseItemHotkeyBGStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Margin" Value="6 0 6 0" />
+        <Setter Property="Padding" Value="4 2 4 2" />
+        <Setter Property="CornerRadius" Value="2" />
+    </Style>
+    <Style
+        x:Key="ItemHotkeyBGSelectedStyle"
+        BasedOn="{StaticResource BaseItemHotkeyBGSelectedStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Margin" Value="6 0 6 0" />
+        <Setter Property="Padding" Value="4 2 4 2" />
+        <Setter Property="CornerRadius" Value="2" />
+    </Style>
+
     <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#100f0f" />
-        <Setter Property="Width" Value="24" />
-        <Setter Property="Height" Value="24" />
-        <Setter Property="FontSize" Value="24" />
+        <Setter Property="Width" Value="20" />
+        <Setter Property="Height" Value="20" />
+        <Setter Property="FontSize" Value="20" />
     </Style>
     <CornerRadius x:Key="ItemRadius">6</CornerRadius>
     <Thickness x:Key="ItemMargin">4 0 4 0</Thickness>
@@ -172,19 +192,19 @@
         BasedOn="{StaticResource ClockPanel}"
         TargetType="{x:Type StackPanel}">
         <Setter Property="Orientation" Value="Horizontal" />
-        <Setter Property="Margin" Value="0,0,42,0" />
+        <Setter Property="Margin" Value="0 0 42 0" />
     </Style>
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="#bebebe" />
-        <Setter Property="Margin" Value="0,0,10,0" />
+        <Setter Property="Margin" Value="0 0 10 0" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible">
                 <Setter Property="FontSize" Value="14" />
-                <Setter Property="Margin" Value="0,0,10,3" />
+                <Setter Property="Margin" Value="0 0 10 3" />
             </DataTrigger>
         </Style.Triggers>
 
@@ -198,15 +218,15 @@
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
                 <Setter Property="FontSize" Value="14" />
-                <Setter Property="Margin" Value="0,0,0,3" />
+                <Setter Property="Margin" Value="0 0 0 3" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
         TargetType="{x:Type Border}">
-        <Setter Property="Margin" Value="0,0,10,8" />
+        <Setter Property="Margin" Value="0 0 10 8" />
         <Setter Property="BorderBrush" Value="#dedcde" />
     </Style>
     <Style

Flow.Launcher/Themes/Win11Light.xaml

@@ -48,7 +48,7 @@
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
         <Setter Property="SelectionBrush" Value="{StaticResource SystemAccentColorLight1Brush}" />
-        <Setter Property="FontSize" Value="18" />
+        <Setter Property="FontSize" Value="16" />
         <Setter Property="Height" Value="42" />
     </Style>
 
@@ -59,7 +59,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="0 0 50 0" />
         <Setter Property="Height" Value="42" />
-        <Setter Property="FontSize" Value="18" />
+        <Setter Property="FontSize" Value="16" />
         <Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
     </Style>
 
@@ -79,7 +79,9 @@
     <Style
         x:Key="PendingLineStyle"
         BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}" />
+        TargetType="{x:Type Line}">
+        <Setter Property="Stroke" Value="{DynamicResource BasicSystemAccentColor}" />
+    </Style>
 
     <!--  Item Style  -->
     <Style
@@ -188,6 +190,7 @@
     <CornerRadius x:Key="ItemRadius">5</CornerRadius>
     <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
     <Thickness x:Key="ResultMargin">0 10 0 10</Thickness>
+    <system:Double x:Key="ResultItemHeight">58</system:Double>
     <Style
         x:Key="ClockPanel"
         BasedOn="{StaticResource ClockPanel}"