Modern Themes

Flow.Launcher.Core/Resource/Theme.cs

@@ -244,7 +244,7 @@ public void AddDropShadowEffectToCurrentTheme()
             effectSetter.Property = Border.EffectProperty;
             effectSetter.Value = new DropShadowEffect
             {
-                Opacity = 0.9,
+                Opacity = 0.4,
                 ShadowDepth = 2,
                 BlurRadius = 15
             };
@@ -261,7 +261,7 @@ public void AddDropShadowEffectToCurrentTheme()
             }
             else
             {
-                var baseMargin = (Thickness) marginSetter.Value;
+                var baseMargin = (Thickness)marginSetter.Value;
                 var newMargin = new Thickness(
                     baseMargin.Left + ShadowExtraMargin,
                     baseMargin.Top + ShadowExtraMargin,
@@ -282,8 +282,8 @@ public void RemoveDropShadowEffectFromCurrentTheme()
 
             var effectSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.EffectProperty) as Setter;
             var marginSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.MarginProperty) as Setter;
-            
-            if(effectSetter != null)
+
+            if (effectSetter != null)
             {
                 windowBorderStyle.Setters.Remove(effectSetter);
             }
@@ -371,11 +371,11 @@ private bool IsBlurTheme()
         private void SetWindowAccent(Window w, AccentState state)
         {
             var windowHelper = new WindowInteropHelper(w);
-            
+
             // this determines the width of the main query window
             w.Width = mainWindowWidth;
             windowHelper.EnsureHandle();
-            
+
             var accent = new AccentPolicy { AccentState = state };
             var accentStructSize = Marshal.SizeOf(accent);
 

Flow.Launcher/Converters/HighlightTextConverter.cs

@@ -1,11 +1,12 @@
-using System;
+using System.Windows;using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
+using System.Windows.Media;
 using System.Windows.Documents;
 
 namespace Flow.Launcher.Converters
@@ -30,7 +31,10 @@ public object Convert(object[] value, Type targetType, object parameter, Culture
                 var currentCharacter = text.Substring(i, 1);
                 if (this.ShouldHighlight(highlightData, i))
                 {
-                    textBlock.Inlines.Add(new Bold(new Run(currentCharacter)));
+                    //textBlock.Inlines.Add(new Bold(new Run(currentCharacter)));
+                    //textBlock.Inlines.Add(new Run(currentCharacter) { Foreground = Brushes.RoyalBlue });
+                    textBlock.Inlines.Add(new Run(currentCharacter) { Style = (Style)Application.Current.FindResource("HighlightStyle") });
+
                 }
                 else
                 {

Flow.Launcher/Flow.Launcher.csproj

@@ -47,7 +47,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Page Remove="Themes\League.Designer.xaml" />
+    <Page Remove="Themes\League.xaml" />
     <Page Remove="Themes\ThemeBuilder\Template.xaml" />
+    <Page Remove="Themes\Win11Dark.Designer.xaml" />
+    <Page Remove="Themes\Win11Dark.xaml" />
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher/MainWindow.xaml

@@ -31,6 +31,7 @@
     <Window.Resources>
         <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter"/>
     </Window.Resources>
+
     <Window.InputBindings>
         <KeyBinding Key="Escape" Command="{Binding EscCommand}"></KeyBinding>
         <KeyBinding Key="F1" Command="{Binding StartHelpCommand}"></KeyBinding>
@@ -62,13 +63,13 @@
         <KeyBinding Key="D9" Modifiers="{Binding OpenResultCommandModifiers}" Command="{Binding OpenResultCommand}" CommandParameter="8"></KeyBinding>
     </Window.InputBindings>
     <Grid>
-        <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown" CornerRadius="5" >
+        <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown">
             <StackPanel Orientation="Vertical">
                 <Grid>
                     <TextBox x:Name="QueryTextSuggestionBox"
                          Style="{DynamicResource QuerySuggestionBoxStyle}"
                          IsEnabled="False"
-                         Margin="18,0,56,0">
+                         Margin="16,0,56,0">
                         <TextBox.Text>
                             <MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
                                 <Binding ElementName="QueryTextBox" Path="Text"/>
@@ -83,24 +84,29 @@
                      AllowDrop="True"
                      Visibility="Visible"
                     Background="Transparent"
-                    Margin="18,0,56,0">
+                    Margin="16,0,56,0">
                         <TextBox.ContextMenu>
                             <ContextMenu>
                                 <MenuItem Command="ApplicationCommands.Cut"/>
                                 <MenuItem Command="ApplicationCommands.Copy"/>
                                 <MenuItem Command="ApplicationCommands.Paste"/>
                                 <Separator />
-                                <MenuItem Header="Settings" Click="OnContextMenusForSettingsClick" />
+                                <MenuItem Header="{DynamicResource flowlauncher_settings}"  Click="OnContextMenusForSettingsClick" />
                             </ContextMenu>
                         </TextBox.ContextMenu>
                     </TextBox>
-                    <svgc:SvgControl Source="{Binding Image}" HorizontalAlignment="Right" Width="42" Height="42"
-                                     Background="Transparent"/>
+                    <svgc:SvgControl Source="{Binding Image}" HorizontalAlignment="Right" Width="25" Height="25" Margin="0,2,18,0" Opacity="0.2" Background="Transparent" Style="{DynamicResource SearchIconStyle}"/>
                 </Grid>
-                <Line x:Name="ProgressBar" HorizontalAlignment="Right"
+
+
+                <Grid>
+                    <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" />
+                    <Line x:Name="ProgressBar" HorizontalAlignment="Right"
                   Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                  Y1="0" Y2="0" X2="100" Height="2" Width="752" StrokeThickness="1">
-                </Line>
+                  Y1="0" Y2="0" X2="100" Height="2" Width="Auto" StrokeThickness="1">
+                    </Line>
+                </Grid>
+
                 <ContentControl>
                     <flowlauncher:ResultListBox x:Name="ResultListBox" DataContext="{Binding Results}" PreviewMouseDown="OnPreviewMouseButtonDown" />
                 </ContentControl>

Flow.Launcher/ResultListBox.xaml

@@ -20,6 +20,7 @@
          IsSynchronizedWithCurrentItem="True"
          PreviewMouseDown="ListBox_PreviewMouseDown">
     <!--IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083-->
+
     <ListBox.ItemTemplate>
         <DataTemplate>
             <Button>
@@ -29,41 +30,43 @@
                     </ControlTemplate>
                 </Button.Template>
                 <Button.Content>
-                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5"
+                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0"
                           Cursor="Hand" UseLayoutRounding="False">
                         <Grid.Resources>
                             <converter:HighlightTextConverter x:Key="HighlightTextConverter"/>
                             <converter:OrdinalConverter x:Key="OrdinalConverter" />
                             <converter:OpenResultHotkeyVisibilityConverter x:Key="OpenResultHotkeyVisibilityConverter" />
                         </Grid.Resources>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="32" />
-                            <ColumnDefinition />
-                            <ColumnDefinition Width="0" />
+                            <ColumnDefinition Width="54" />
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <Image x:Name="ImageIcon" Width="32" Height="32" HorizontalAlignment="Left"
-                               Source="{Binding Image}" Visibility="{Binding ShowIcon}" />
-                        <TextBlock Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                   Text="{Binding Glyph.Glyph}" FontFamily="{Binding Glyph.FontFamily}" FontSize="24"
-                                   Visibility="{Binding ShowGlyph}"/>
-                        <Grid Margin="5 0 5 0" Grid.Column="1" HorizontalAlignment="Stretch">
+                        <StackPanel Visibility="{Binding ShowOpenResultHotkey}" Grid.Column="2" Margin="0 0 10 0">
+                            <TextBlock Margin="12 0 12 0" Style="{DynamicResource ItemHotkeyStyle}" HorizontalAlignment="Right" Opacity="0.8" VerticalAlignment="Center" Padding="0 10 0 10">
+                                <TextBlock.Visibility>
+                                    <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" />
+                                </TextBlock.Visibility>
+                                <TextBlock.Text>
+                                    <MultiBinding StringFormat="{}{0}+{1}">
+                                        <Binding Path="OpenResultModifiers" />
+                                        <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" Converter="{StaticResource ResourceKey=OrdinalConverter}" />
+                                    </MultiBinding>
+                                </TextBlock.Text>
+                            </TextBlock>
+                        </StackPanel>
+                        <Border BorderThickness="0" BorderBrush="Transparent" Margin="14 0 0 0">
+                            <Image x:Name="ImageIcon" Width="32" Height="32" HorizontalAlignment="Center" Source="{Binding Image}" Visibility="{Binding ShowIcon}"  Margin="0 0 0 0"/>
+                        </Border>
+                        <Border BorderThickness="0" BorderBrush="Transparent" Margin="14 0 0 0">
+                            <TextBlock Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Glyph.Glyph}" FontFamily="{Binding Glyph.FontFamily}" FontSize="24" Visibility="{Binding ShowGlyph}"  Margin="12 0 0 0" />
+                        </Border>
+                        <Grid Margin="6 0 6 0" Grid.Column="1" HorizontalAlignment="Stretch">
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition" />
                             </Grid.RowDefinitions>
-                            <StackPanel Visibility="{Binding ShowOpenResultHotkey}">
-                                <TextBlock Margin="0 5 5 0" Style="{DynamicResource ItemSubTitleStyle}" HorizontalAlignment="Right" Opacity="0.8" >
-                                    <TextBlock.Visibility>
-                                        <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" />
-                                    </TextBlock.Visibility>
-                                    <TextBlock.Text>
-                                        <MultiBinding StringFormat="{}{0}+{1}">
-                                            <Binding Path="OpenResultModifiers" />
-                                            <Binding RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" Converter="{StaticResource ResourceKey=OrdinalConverter}" />
-                                        </MultiBinding>
-                                    </TextBlock.Text>
-                                </TextBlock>
-                            </StackPanel>
+
                             <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
                                        VerticalAlignment="Center" ToolTip="{Binding ShowTitleToolTip}" x:Name="Title"
                                        Text="{Binding Result.Title}">
@@ -104,7 +107,7 @@
         <Style TargetType="{x:Type ListBoxItem}">
             <EventSetter Event="MouseEnter" Handler="OnMouseEnter" />
             <EventSetter Event="MouseMove" Handler="OnMouseMove" />
-            <Setter Property="Height" Value="50" />
+            <Setter Property="Height" Value="52" />
             <Setter Property="Margin" Value="0" />
             <Setter Property="Padding" Value="0" />
             <Setter Property="BorderThickness" Value="0" />

Flow.Launcher/Themes/Base.xaml

@@ -6,9 +6,11 @@
     <Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontSize" Value="28" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Height" Value="46" />
+        <Setter Property="FontWeight" Value="Regular" />
+        <Setter Property="Height" Value="56" />
+        <Setter Property="Padding" Value="0 4 0 0" />
         <Setter Property="Background" Value="#2F2F2F" />
+        <Setter Property="Width" Value="536" />
         <Setter Property="Foreground" Value="#E3E0E3" />
         <Setter Property="CaretBrush" Value="#E3E0E3" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -36,24 +38,26 @@
     <!-- Further font customisations are dynamically loaded in Theme.cs -->
     <Style x:Key="BaseQuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="DarkGray" />
+        <Setter Property="Width" Value="536" />
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="0 4 0 0" />
     </Style>
-        
+
     <Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="CornerRadius" Value="0" />
         <Setter Property="Background" Value="#2F2F2F"></Setter>
-        <Setter Property="Padding" Value="8 10 8 8" />
+        <Setter Property="Padding" Value="0 0 0 0" />
     </Style>
     <Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="750" />
+        <Setter Property="Width" Value="586" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
     </Style>
 
     <Style x:Key="BasePendingLineStyle" TargetType="{x:Type Line}">
         <Setter Property="Stroke" Value="Blue" />
     </Style>
 
+
     <!-- Item Style -->
     <Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
@@ -64,6 +68,8 @@
     <Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#D9D9D4" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
+        <Setter Property="FontSize" Value="13" />
+        <Setter Property="FontWeight" Value="Normal" />
     </Style>
     <Style x:Key="BaseItemNumberStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -75,19 +81,19 @@
     <Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
-        <Setter Property="FontWeight" Value="Medium" />
+        <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
     </Style>
     <Style x:Key="BaseItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#D9D9D4" />
+        <Setter Property="FontSize" Value="13" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
     </Style>
 
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#4D4D4D</SolidColorBrush>
 
     <Style x:Key="BaseItemImageSelectedStyle" TargetType="{x:Type Image}" >
-    </Style>    
-    
+    </Style>
+
     <Style x:Key="BaseListboxStyle" TargetType="{x:Type ListBox}">
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="Background" Value="Transparent"/>
@@ -96,6 +102,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ListBox">
+                    <!--                    <ScrollViewer Focusable="false" Template="{DynamicResource ScrollViewerControlTemplate}">-->
                     <ScrollViewer Focusable="false" Template="{DynamicResource ScrollViewerControlTemplate}">
                         <VirtualizingStackPanel IsItemsHost="True" />
                     </ScrollViewer>
@@ -120,15 +127,15 @@
                                         ContentTemplate="{TemplateBinding ContentTemplate}"
                                         Content="{TemplateBinding Content}"
                                         Grid.Column="0"
-                                        Margin="{TemplateBinding Padding}"
+                                        Margin="0"
                                         Grid.Row="0" />
 
             <!--Scrollbar in thr rigth of ScrollViewer-->
             <ScrollBar x:Name="PART_VerticalScrollBar"
                            AutomationProperties.AutomationId="VerticalScrollBar"
                            Cursor="Arrow"
                            Grid.Column="1"
-                           Margin="3 0 0 0"
+                           Margin="0 0 0 0"
                            Maximum="{TemplateBinding ScrollableHeight}"
                            Minimum="0"
                            Grid.Row="0"
@@ -149,7 +156,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border CornerRadius="2" DockPanel.Dock="Right" Background="#616161" BorderBrush="Transparent" BorderThickness="0" />
+                    <Border CornerRadius="2" DockPanel.Dock="Right" Background="#bebebe" BorderBrush="Transparent" BorderThickness="0" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -176,4 +183,15 @@
         </Setter>
 
     </Style>
+
+
+    <Style x:Key="BaseSeparatorStyle" TargetType="Rectangle">
+        <Setter Property="Visibility" Value="Collapsed" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
+                <Setter Property="Visibility" Value="Visible" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
 </ResourceDictionary>
+