From a92ebf5756ba6f937189f3c30becbd88e3104040 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Sun, 8 Jan 2023 16:31:37 -0600
Subject: [PATCH 1/6] Dynamic Height and Dynamic Icon Size

---
 .../DiameterToCenterPointConverter.cs         |  25 +++
 .../Converters/IconRadiusConverter.cs         |  27 +++
 Flow.Launcher/ResultListBox.xaml              | 155 +++++++++++-------
 Flow.Launcher/Themes/Base.xaml                |   8 +
 Flow.Launcher/ViewModel/ResultsViewModel.cs   |   2 +-
 5 files changed, 156 insertions(+), 61 deletions(-)
 create mode 100644 Flow.Launcher/Converters/DiameterToCenterPointConverter.cs
 create mode 100644 Flow.Launcher/Converters/IconRadiusConverter.cs

diff --git a/Flow.Launcher/Converters/DiameterToCenterPointConverter.cs b/Flow.Launcher/Converters/DiameterToCenterPointConverter.cs
new file mode 100644
index 00000000000..e81bb250790
--- /dev/null
+++ b/Flow.Launcher/Converters/DiameterToCenterPointConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Flow.Launcher.Converters
+{
+    public class DiameterToCenterPointConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is double d)
+            {
+                return new Point(d / 2, d / 2);
+            }
+
+            return new Point(0, 0);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
diff --git a/Flow.Launcher/Converters/IconRadiusConverter.cs b/Flow.Launcher/Converters/IconRadiusConverter.cs
new file mode 100644
index 00000000000..51129cfb873
--- /dev/null
+++ b/Flow.Launcher/Converters/IconRadiusConverter.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using Windows.Devices.PointOfService;
+
+namespace Flow.Launcher.Converters
+{
+    public class IconRadiusConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values.Length != 2)
+                throw new ArgumentException("IconRadiusConverter must have 2 parameters");
+
+            return values[1] switch
+            {
+                true => (double)values[0] / 2,
+                false => (double)values[0],
+                _ => throw new ArgumentException("The second argument should be boolean", nameof(values))
+            };
+        }
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 8f3238303f3..b2ab4a28770 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -1,5 +1,4 @@
-<ListBox
-    x:Class="Flow.Launcher.ResultListBox"
+<ListBox x:Class="Flow.Launcher.ResultListBox"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converter="clr-namespace:Flow.Launcher.Converters"
@@ -31,6 +30,10 @@
     mc:Ignorable="d">
     <!--  IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083  -->
 
+    <ListBox.Resources>
+        <converter:IconRadiusConverter x:Key="IconRadiusConverter" />
+        <converter:DiameterToCenterPointConverter x:Key="DiameterToCenterPointConverter" />
+    </ListBox.Resources>
     <ListBox.ItemTemplate>
         <DataTemplate>
             <Button HorizontalAlignment="Stretch">
@@ -40,8 +43,7 @@
                     </ControlTemplate>
                 </Button.Template>
                 <Button.Content>
-                    <Grid
-                        Margin="0"
+                    <Grid Margin="0"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         Cursor="Hand"
@@ -54,28 +56,30 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="60" />
                             <ColumnDefinition Width="9*" />
-                            <ColumnDefinition Width="Auto" MinWidth="8" />
+                            <ColumnDefinition Width="Auto"
+                                MinWidth="8" />
                         </Grid.ColumnDefinitions>
-                        <StackPanel
-                            x:Name="HotkeyArea"
+                        <StackPanel x:Name="HotkeyArea"
                             Grid.Column="2"
                             Margin="0,0,10,0"
                             VerticalAlignment="Center"
                             Visibility="{Binding ShowOpenResultHotkey}">
-                            <TextBlock
-                                x:Name="Hotkey"
+                            <TextBlock x:Name="Hotkey"
                                 Margin="12,0,12,0"
                                 Padding="0,0,0,0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
                                 Style="{DynamicResource ItemHotkeyStyle}">
                                 <TextBlock.Visibility>
-                                    <Binding Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
+                                    <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}" />
+                                        <Binding Converter="{StaticResource ResourceKey=OrdinalConverter}"
+                                            RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
                                     </MultiBinding>
                                 </TextBlock.Text>
                             </TextBlock>
@@ -87,20 +91,16 @@
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
 
-                            <Border
-                                x:Name="Bullet"
+                            <Border x:Name="Bullet"
                                 Grid.Column="0"
                                 Style="{DynamicResource BulletStyle}" />
 
-                            <Border
-                                Grid.Column="1"
+                            <Border Grid.Column="1"
                                 Margin="9,0,0,0"
                                 BorderBrush="Transparent"
                                 BorderThickness="1">
-                                <Image
-                                    x:Name="ImageIcon"
-                                    Width="{Binding IconXY}"
-                                    Height="{Binding IconXY}"
+                                <Image x:Name="ImageIcon"
+                                    Style="{DynamicResource ImageIconStyle}"
                                     Margin="0,0,0,0"
                                     HorizontalAlignment="Center"
                                     IsHitTestVisible="False"
@@ -110,19 +110,30 @@
                                     Visibility="{Binding ShowIcon}">
                                     <Image.Clip>
                                         <EllipseGeometry
-                                            Center="16 16"
-                                            RadiusX="{Binding IconRadius}"
-                                            RadiusY="{Binding IconRadius}" />
+                                            Center="{Binding ElementName=ImageIcon, Path=ActualWidth, Converter={StaticResource DiameterToCenterPointConverter}}">
+                                            <EllipseGeometry.RadiusX>
+                                                <MultiBinding Converter="{StaticResource IconRadiusConverter}">
+                                                    <Binding ElementName="ImageIcon"
+                                                        Path="ActualWidth" />
+                                                    <Binding Path="Result.RoundedIcon" />
+                                                </MultiBinding>
+                                            </EllipseGeometry.RadiusX>
+                                            <EllipseGeometry.RadiusY>
+                                                <MultiBinding Converter="{StaticResource IconRadiusConverter}">
+                                                    <Binding ElementName="ImageIcon"
+                                                        Path="ActualWidth" />
+                                                    <Binding Path="Result.RoundedIcon" />
+                                                </MultiBinding>
+                                            </EllipseGeometry.RadiusY>
+                                        </EllipseGeometry>
                                     </Image.Clip>
                                 </Image>
                             </Border>
-                            <Border
-                                Grid.Column="1"
+                            <Border Grid.Column="1"
                                 Margin="9,0,0,0"
                                 BorderBrush="Transparent"
                                 BorderThickness="0">
-                                <TextBlock
-                                    x:Name="GlyphIcon"
+                                <TextBlock x:Name="GlyphIcon"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     FontFamily="{Binding Glyph.FontFamily}"
@@ -132,33 +143,35 @@
                             </Border>
                         </Grid>
 
-                        <Grid
-                            Grid.Column="1"
+                        <Grid Grid.Column="1"
                             Margin="6,0,10,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Center">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="SubTitleRowDefinition" Height="Auto" />
+                                <RowDefinition x:Name="SubTitleRowDefinition"
+                                    Height="Auto" />
                             </Grid.RowDefinitions>
-                            <ProgressBar
-                                x:Name="progressbarResult"
+                            <ProgressBar x:Name="progressbarResult"
                                 Grid.Row="0"
                                 Foreground="{Binding Result.ProgressBarColor}"
                                 Value="{Binding ResultProgress, Mode=OneWay}">
                                 <ProgressBar.Style>
-                                    <Style BasedOn="{StaticResource ProgressBarResult}" TargetType="ProgressBar">
-                                        <Setter Property="Visibility" Value="Visible" />
+                                    <Style BasedOn="{StaticResource ProgressBarResult}"
+                                        TargetType="ProgressBar">
+                                        <Setter Property="Visibility"
+                                            Value="Visible" />
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Result.ProgressBar}" Value="{x:Null}">
-                                                <Setter Property="Visibility" Value="Collapsed" />
+                                            <DataTrigger Binding="{Binding Result.ProgressBar}"
+                                                Value="{x:Null}">
+                                                <Setter Property="Visibility"
+                                                    Value="Collapsed" />
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
                                 </ProgressBar.Style>
                             </ProgressBar>
-                            <TextBlock
-                                x:Name="Title"
+                            <TextBlock x:Name="Title"
                                 Grid.Row="0"
                                 VerticalAlignment="Center"
                                 DockPanel.Dock="Left"
@@ -175,8 +188,7 @@
                                     </MultiBinding>
                                 </vm:ResultsViewModel.FormattedText>
                             </TextBlock>
-                            <TextBlock
-                                x:Name="SubTitle"
+                            <TextBlock x:Name="SubTitle"
                                 Grid.Row="1"
                                 IsEnabled="False"
                                 Style="{DynamicResource ItemSubTitleStyle}"
@@ -191,13 +203,27 @@
             </Button>
             <!--  a result item height is 52 including margin  -->
             <DataTemplate.Triggers>
-                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
-                    <Setter TargetName="Bullet" Property="Style" Value="{DynamicResource ItemBulletSelectedStyle}" />
-                    <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="ImageIcon" Property="Style" Value="{DynamicResource ItemImageSelectedStyle}" />
-                    <Setter TargetName="GlyphIcon" Property="Style" Value="{DynamicResource ItemGlyphSelectedStyle}" />
+                <DataTrigger
+                    Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
+                    Value="True">
+                    <Setter TargetName="Bullet"
+                        Property="Style"
+                        Value="{DynamicResource ItemBulletSelectedStyle}" />
+                    <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="ImageIcon"
+                        Property="Style"
+                        Value="{DynamicResource ItemImageSelectedStyle}" />
+                    <Setter TargetName="GlyphIcon"
+                        Property="Style"
+                        Value="{DynamicResource ItemGlyphSelectedStyle}" />
                 </DataTrigger>
             </DataTemplate.Triggers>
         </DataTemplate>
@@ -205,24 +231,28 @@
     <!--  http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062  -->
     <ListBox.ItemContainerStyle>
         <Style TargetType="{x:Type ListBoxItem}">
-            <EventSetter Event="MouseEnter" Handler="OnMouseEnter" />
-            <EventSetter Event="MouseMove" Handler="OnMouseMove" />
-            <Setter Property="Height" Value="52" />
-            <Setter Property="Margin" Value="0" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="BorderThickness" Value="0" />
+            <EventSetter Event="MouseEnter"
+                Handler="OnMouseEnter" />
+            <EventSetter Event="MouseMove"
+                Handler="OnMouseMove" />
+            <Setter Property="Height"
+                Value="{DynamicResource ResultItemHeight}" />
+            <Setter Property="Margin"
+                Value="0" />
+            <Setter Property="Padding"
+                Value="0" />
+            <Setter Property="BorderThickness"
+                Value="0" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <Border
-                            x:Name="Bd"
+                        <Border x:Name="Bd"
                             Margin="{DynamicResource ItemMargin}"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             CornerRadius="{DynamicResource ItemRadius}"
                             SnapsToDevicePixels="True">
-                            <ContentPresenter
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                 Content="{TemplateBinding Content}"
                                 ContentStringFormat="{TemplateBinding ContentStringFormat}"
@@ -230,9 +260,14 @@
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
-                            <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ItemSelectedBackgroundColor}" />
-                                <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                            <Trigger Property="IsSelected"
+                                Value="True">
+                                <Setter TargetName="Bd"
+                                    Property="Background"
+                                    Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                                <Setter TargetName="Bd"
+                                    Property="BorderBrush"
+                                    Value="{DynamicResource ItemSelectedBackgroundColor}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -240,4 +275,4 @@
             </Setter>
         </Style>
     </ListBox.ItemContainerStyle>
-</ListBox>
+</ListBox>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 0b4460d46de..7e2e1fadd16 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -8,6 +8,8 @@
     <Thickness x:Key="ResultMargin">0</Thickness>
     <!--  Further font customisations are dynamically loaded in Theme.cs  -->
 
+    <system:Double x:Key="ResultItemHeight">52</system:Double>
+    
     <Style x:Key="BaseBulletStyle" TargetType="{x:Type Border}" />
     <Style
         x:Key="BulletStyle"
@@ -17,6 +19,12 @@
         x:Key="ItemBulletSelectedStyle"
         BasedOn="{StaticResource BaseBulletStyle}"
         TargetType="{x:Type Border}" />
+    <Style
+        x:Key="ImageIconStyle"
+        TargetType="{x:Type Image}">
+        <Setter Property="Height" Value="32"/>
+        <Setter Property="Width" Value="32"/>
+    </Style>
 
     <Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}">
         <Setter Property="BorderThickness" Value="0" />
diff --git a/Flow.Launcher/ViewModel/ResultsViewModel.cs b/Flow.Launcher/ViewModel/ResultsViewModel.cs
index dce29864413..e84fe03c504 100644
--- a/Flow.Launcher/ViewModel/ResultsViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultsViewModel.cs
@@ -43,7 +43,7 @@ public ResultsViewModel(Settings settings) : this()
 
         #region Properties
 
-        public int MaxHeight => MaxResults * 52;
+        public double MaxHeight => MaxResults * (double)Application.Current.FindResource("ResultItemHeight")!;
 
         public int SelectedIndex { get; set; }
 

From ed526e3486b40114b51bb792c987d3246e199725 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 9 Jan 2023 10:42:05 +0900
Subject: [PATCH 2/6] - Fix ImageIcon Size when Selected Situation - Fix
 Preview in setting window - Add ImageIcon Width property

---
 Flow.Launcher/MainWindow.xaml    |  27 +++---
 Flow.Launcher/ResultListBox.xaml | 139 +++++++++++++------------------
 Flow.Launcher/SettingWindow.xaml |   4 +-
 Flow.Launcher/Themes/Base.xaml   |  21 +++--
 4 files changed, 87 insertions(+), 104 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 6ef8353d3cb..a9554da3420 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -9,11 +9,11 @@
     xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
-    d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
     Name="FlowMainWindow"
     Title="Flow Launcher"
     MinWidth="{Binding MainWindowWidth, Mode=OneWay}"
     MaxWidth="{Binding MainWindowWidth, Mode=OneWay}"
+    d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
     AllowDrop="True"
     AllowsTransparency="True"
     Background="Transparent"
@@ -38,9 +38,9 @@
         <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter" />
         <converters:BorderClipConverter x:Key="BorderClipConverter" />
         <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-        <converters:BoolToIMEConversionModeConverter x:Key="BoolToIMEConversionModeConverter"/>
-        <converters:BoolToIMEStateConverter x:Key="BoolToIMEStateConverter"/>
-        <converters:StringToKeyBindingConverter x:Key="StringToKeyBindingConverter"/>
+        <converters:BoolToIMEConversionModeConverter x:Key="BoolToIMEConversionModeConverter" />
+        <converters:BoolToIMEStateConverter x:Key="BoolToIMEStateConverter" />
+        <converters:StringToKeyBindingConverter x:Key="StringToKeyBindingConverter" />
     </Window.Resources>
     <Window.InputBindings>
         <KeyBinding Key="Escape" Command="{Binding EscCommand}" />
@@ -180,11 +180,11 @@
         <KeyBinding
             Key="F12"
             Command="{Binding ToggleGameModeCommand}"
-            Modifiers="Ctrl"/>
+            Modifiers="Ctrl" />
         <KeyBinding
             Key="{Binding PreviewHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
             Command="{Binding TogglePreviewCommand}"
-            Modifiers="{Binding PreviewHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}"/>
+            Modifiers="{Binding PreviewHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
     </Window.InputBindings>
     <Grid>
         <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">
@@ -207,12 +207,12 @@
                             <TextBox
                                 x:Name="QueryTextBox"
                                 AllowDrop="True"
+                                InputMethod.PreferredImeConversionMode="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEConversionModeConverter}}"
+                                InputMethod.PreferredImeState="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEStateConverter}}"
                                 PreviewDragOver="OnPreviewDragOver"
                                 PreviewKeyUp="QueryTextBox_KeyUp"
                                 Style="{DynamicResource QueryBoxStyle}"
                                 Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                InputMethod.PreferredImeConversionMode="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEConversionModeConverter}}"
-                                InputMethod.PreferredImeState="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEStateConverter}}"
                                 Visibility="Visible">
                                 <TextBox.CommandBindings>
                                     <CommandBinding Command="ApplicationCommands.Copy" Executed="OnCopy" />
@@ -273,9 +273,6 @@
                         <Grid>
                             <Image
                                 x:Name="PluginActivationIcon"
-                                Width="32"
-                                Height="32"
-                                Margin="0,0,18,0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
                                 Panel.ZIndex="2"
@@ -403,10 +400,10 @@
                         VerticalAlignment="Stretch"
                         Style="{DynamicResource PreviewArea}"
                         Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">
-                        <Border 
-                            Style="{DynamicResource PreviewBorderStyle}" 
+                        <Border
                             d:DataContext="{d:DesignInstance vm:ResultViewModel}"
                             DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
+                            Style="{DynamicResource PreviewBorderStyle}"
                             Visibility="{Binding ShowDefaultPreview}">
                             <Grid
                                 Margin="20,0,10,0"
@@ -478,10 +475,10 @@
                                 </StackPanel>
                             </Grid>
                         </Border>
-                        <Border 
+                        <Border
                             d:DataContext="{d:DesignInstance vm:ResultViewModel}"
                             DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
-                            Style="{DynamicResource PreviewBorderStyle}" 
+                            Style="{DynamicResource PreviewBorderStyle}"
                             Visibility="{Binding ShowCustomizedPreview}">
                             <ContentControl Content="{Binding Result.PreviewPanel.Value}" />
                         </Border>
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index b2ab4a28770..dd3fb63ec83 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -1,4 +1,5 @@
-<ListBox x:Class="Flow.Launcher.ResultListBox"
+<ListBox
+    x:Class="Flow.Launcher.ResultListBox"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converter="clr-namespace:Flow.Launcher.Converters"
@@ -43,7 +44,8 @@
                     </ControlTemplate>
                 </Button.Template>
                 <Button.Content>
-                    <Grid Margin="0"
+                    <Grid
+                        Margin="0"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         Cursor="Hand"
@@ -54,32 +56,30 @@
                             <converter:OpenResultHotkeyVisibilityConverter x:Key="OpenResultHotkeyVisibilityConverter" />
                         </Grid.Resources>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="60" />
+                            <ColumnDefinition Style="{DynamicResource ImageAreaWidth}" />
                             <ColumnDefinition Width="9*" />
-                            <ColumnDefinition Width="Auto"
-                                MinWidth="8" />
+                            <ColumnDefinition Width="Auto" MinWidth="8" />
                         </Grid.ColumnDefinitions>
-                        <StackPanel x:Name="HotkeyArea"
+                        <StackPanel
+                            x:Name="HotkeyArea"
                             Grid.Column="2"
                             Margin="0,0,10,0"
                             VerticalAlignment="Center"
                             Visibility="{Binding ShowOpenResultHotkey}">
-                            <TextBlock x:Name="Hotkey"
+                            <TextBlock
+                                x:Name="Hotkey"
                                 Margin="12,0,12,0"
                                 Padding="0,0,0,0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
                                 Style="{DynamicResource ItemHotkeyStyle}">
                                 <TextBlock.Visibility>
-                                    <Binding
-                                        Converter="{StaticResource ResourceKey=OpenResultHotkeyVisibilityConverter}"
-                                        RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
+                                    <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}" />
+                                        <Binding Converter="{StaticResource ResourceKey=OrdinalConverter}" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}" />
                                     </MultiBinding>
                                 </TextBlock.Text>
                             </TextBlock>
@@ -91,37 +91,37 @@
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
 
-                            <Border x:Name="Bullet"
+                            <Border
+                                x:Name="Bullet"
                                 Grid.Column="0"
                                 Style="{DynamicResource BulletStyle}" />
 
-                            <Border Grid.Column="1"
+                            <Border
+                                Grid.Column="1"
                                 Margin="9,0,0,0"
                                 BorderBrush="Transparent"
                                 BorderThickness="1">
-                                <Image x:Name="ImageIcon"
-                                    Style="{DynamicResource ImageIconStyle}"
+                                <Image
+                                    x:Name="ImageIcon"
                                     Margin="0,0,0,0"
                                     HorizontalAlignment="Center"
                                     IsHitTestVisible="False"
                                     RenderOptions.BitmapScalingMode="Fant"
                                     Source="{Binding Image, TargetNullValue={x:Null}}"
                                     Stretch="Uniform"
+                                    Style="{DynamicResource ImageIconStyle}"
                                     Visibility="{Binding ShowIcon}">
                                     <Image.Clip>
-                                        <EllipseGeometry
-                                            Center="{Binding ElementName=ImageIcon, Path=ActualWidth, Converter={StaticResource DiameterToCenterPointConverter}}">
+                                        <EllipseGeometry Center="{Binding ElementName=ImageIcon, Path=ActualWidth, Converter={StaticResource DiameterToCenterPointConverter}}">
                                             <EllipseGeometry.RadiusX>
                                                 <MultiBinding Converter="{StaticResource IconRadiusConverter}">
-                                                    <Binding ElementName="ImageIcon"
-                                                        Path="ActualWidth" />
+                                                    <Binding ElementName="ImageIcon" Path="ActualWidth" />
                                                     <Binding Path="Result.RoundedIcon" />
                                                 </MultiBinding>
                                             </EllipseGeometry.RadiusX>
                                             <EllipseGeometry.RadiusY>
                                                 <MultiBinding Converter="{StaticResource IconRadiusConverter}">
-                                                    <Binding ElementName="ImageIcon"
-                                                        Path="ActualWidth" />
+                                                    <Binding ElementName="ImageIcon" Path="ActualWidth" />
                                                     <Binding Path="Result.RoundedIcon" />
                                                 </MultiBinding>
                                             </EllipseGeometry.RadiusY>
@@ -129,11 +129,13 @@
                                     </Image.Clip>
                                 </Image>
                             </Border>
-                            <Border Grid.Column="1"
+                            <Border
+                                Grid.Column="1"
                                 Margin="9,0,0,0"
                                 BorderBrush="Transparent"
                                 BorderThickness="0">
-                                <TextBlock x:Name="GlyphIcon"
+                                <TextBlock
+                                    x:Name="GlyphIcon"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     FontFamily="{Binding Glyph.FontFamily}"
@@ -143,35 +145,33 @@
                             </Border>
                         </Grid>
 
-                        <Grid Grid.Column="1"
+                        <Grid
+                            Grid.Column="1"
                             Margin="6,0,10,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Center">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
-                                <RowDefinition x:Name="SubTitleRowDefinition"
-                                    Height="Auto" />
+                                <RowDefinition x:Name="SubTitleRowDefinition" Height="Auto" />
                             </Grid.RowDefinitions>
-                            <ProgressBar x:Name="progressbarResult"
+                            <ProgressBar
+                                x:Name="progressbarResult"
                                 Grid.Row="0"
                                 Foreground="{Binding Result.ProgressBarColor}"
                                 Value="{Binding ResultProgress, Mode=OneWay}">
                                 <ProgressBar.Style>
-                                    <Style BasedOn="{StaticResource ProgressBarResult}"
-                                        TargetType="ProgressBar">
-                                        <Setter Property="Visibility"
-                                            Value="Visible" />
+                                    <Style BasedOn="{StaticResource ProgressBarResult}" TargetType="ProgressBar">
+                                        <Setter Property="Visibility" Value="Visible" />
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Result.ProgressBar}"
-                                                Value="{x:Null}">
-                                                <Setter Property="Visibility"
-                                                    Value="Collapsed" />
+                                            <DataTrigger Binding="{Binding Result.ProgressBar}" Value="{x:Null}">
+                                                <Setter Property="Visibility" Value="Collapsed" />
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
                                 </ProgressBar.Style>
                             </ProgressBar>
-                            <TextBlock x:Name="Title"
+                            <TextBlock
+                                x:Name="Title"
                                 Grid.Row="0"
                                 VerticalAlignment="Center"
                                 DockPanel.Dock="Left"
@@ -188,7 +188,8 @@
                                     </MultiBinding>
                                 </vm:ResultsViewModel.FormattedText>
                             </TextBlock>
-                            <TextBlock x:Name="SubTitle"
+                            <TextBlock
+                                x:Name="SubTitle"
                                 Grid.Row="1"
                                 IsEnabled="False"
                                 Style="{DynamicResource ItemSubTitleStyle}"
@@ -203,27 +204,12 @@
             </Button>
             <!--  a result item height is 52 including margin  -->
             <DataTemplate.Triggers>
-                <DataTrigger
-                    Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
-                    Value="True">
-                    <Setter TargetName="Bullet"
-                        Property="Style"
-                        Value="{DynamicResource ItemBulletSelectedStyle}" />
-                    <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="ImageIcon"
-                        Property="Style"
-                        Value="{DynamicResource ItemImageSelectedStyle}" />
-                    <Setter TargetName="GlyphIcon"
-                        Property="Style"
-                        Value="{DynamicResource ItemGlyphSelectedStyle}" />
+                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
+                    <Setter TargetName="Bullet" Property="Style" Value="{DynamicResource ItemBulletSelectedStyle}" />
+                    <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="GlyphIcon" Property="Style" Value="{DynamicResource ItemGlyphSelectedStyle}" />
                 </DataTrigger>
             </DataTemplate.Triggers>
         </DataTemplate>
@@ -231,28 +217,24 @@
     <!--  http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062  -->
     <ListBox.ItemContainerStyle>
         <Style TargetType="{x:Type ListBoxItem}">
-            <EventSetter Event="MouseEnter"
-                Handler="OnMouseEnter" />
-            <EventSetter Event="MouseMove"
-                Handler="OnMouseMove" />
-            <Setter Property="Height"
-                Value="{DynamicResource ResultItemHeight}" />
-            <Setter Property="Margin"
-                Value="0" />
-            <Setter Property="Padding"
-                Value="0" />
-            <Setter Property="BorderThickness"
-                Value="0" />
+            <EventSetter Event="MouseEnter" Handler="OnMouseEnter" />
+            <EventSetter Event="MouseMove" Handler="OnMouseMove" />
+            <Setter Property="Height" Value="{DynamicResource ResultItemHeight}" />
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="BorderThickness" Value="0" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <Border x:Name="Bd"
+                        <Border
+                            x:Name="Bd"
                             Margin="{DynamicResource ItemMargin}"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             CornerRadius="{DynamicResource ItemRadius}"
                             SnapsToDevicePixels="True">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                 Content="{TemplateBinding Content}"
                                 ContentStringFormat="{TemplateBinding ContentStringFormat}"
@@ -260,14 +242,9 @@
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
-                            <Trigger Property="IsSelected"
-                                Value="True">
-                                <Setter TargetName="Bd"
-                                    Property="Background"
-                                    Value="{DynamicResource ItemSelectedBackgroundColor}" />
-                                <Setter TargetName="Bd"
-                                    Property="BorderBrush"
-                                    Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource ItemSelectedBackgroundColor}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 81ced68a829..d26680edde0 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1821,7 +1821,7 @@
                                                 </Border.Clip>
                                                 <Grid>
                                                     <Grid.RowDefinitions>
-                                                        <RowDefinition Height="54" />
+                                                        <RowDefinition Height="Auto" />
                                                         <RowDefinition />
                                                         <RowDefinition />
                                                     </Grid.RowDefinitions>
@@ -2438,7 +2438,7 @@
                                     <Border Margin="0,8,0,0" Style="{DynamicResource SettingGroupBox}">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
                                             <StackPanel Style="{StaticResource TextPanel}">
-                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource previewHotkey}"/>
+                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource previewHotkey}" />
                                                 <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource previewHotkeyToolTip}" />
                                             </StackPanel>
                                             <flowlauncher:HotkeyControl
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 7e2e1fadd16..08a1d5add3f 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -9,7 +9,7 @@
     <!--  Further font customisations are dynamically loaded in Theme.cs  -->
 
     <system:Double x:Key="ResultItemHeight">52</system:Double>
-    
+
     <Style x:Key="BaseBulletStyle" TargetType="{x:Type Border}" />
     <Style
         x:Key="BulletStyle"
@@ -19,11 +19,9 @@
         x:Key="ItemBulletSelectedStyle"
         BasedOn="{StaticResource BaseBulletStyle}"
         TargetType="{x:Type Border}" />
-    <Style
-        x:Key="ImageIconStyle"
-        TargetType="{x:Type Image}">
-        <Setter Property="Height" Value="32"/>
-        <Setter Property="Width" Value="32"/>
+    <Style x:Key="ImageIconStyle" TargetType="{x:Type Image}">
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Width" Value="32" />
     </Style>
 
     <Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}">
@@ -433,6 +431,9 @@
             </DataTrigger>
         </Style.Triggers>
     </Style>
+    <Style x:Key="ImageAreaWidth" TargetType="{x:Type ColumnDefinition}">
+        <Setter Property="Width" Value="60" />
+    </Style>
     <Style
         x:Key="PreviewGlyph"
         BasedOn="{StaticResource BasePreviewGlyph}"
@@ -472,6 +473,14 @@
         </Style.Triggers>
     </Style>
     <!--  for classic themes  -->
+
+    <Style x:Key="PluginActivationIcon" TargetType="{x:Type Image}">
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Margin" Value="0,0,18,0" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+
     <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
         <Setter Property="Fill" Value="#555555" />
         <Setter Property="Width" Value="32" />

From a645664990ecd2b46eb2d867708cac196b21a8c6 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 9 Jan 2023 10:49:35 +0900
Subject: [PATCH 3/6] Add Slim Theme

---
 Flow.Launcher/Themes/SlimLight.xaml | 217 ++++++++++++++++++++++++++++
 1 file changed, 217 insertions(+)
 create mode 100644 Flow.Launcher/Themes/SlimLight.xaml

diff --git a/Flow.Launcher/Themes/SlimLight.xaml b/Flow.Launcher/Themes/SlimLight.xaml
new file mode 100644
index 00000000000..dc08eec3003
--- /dev/null
+++ b/Flow.Launcher/Themes/SlimLight.xaml
@@ -0,0 +1,217 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <system:Double x:Key="ResultItemHeight">38</system:Double>
+    <Style x:Key="ImageAreaWidth" TargetType="{x:Type ColumnDefinition}">
+        <Setter Property="Width" Value="46" />
+    </Style>
+    <Style x:Key="ImageIconStyle" TargetType="{x:Type Image}">
+        <Setter Property="Height" Value="24" />
+        <Setter Property="Width" Value="24" />
+    </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="Foreground" Value="#100f0f" />
+    </Style>
+    <Style
+        x:Key="QueryBoxStyle"
+        BasedOn="{StaticResource BaseQueryBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Padding" Value="0,2,42,0" />
+        <Setter Property="Foreground" Value="#282728" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="Height" Value="24" />
+    </Style>
+
+    <Style
+        x:Key="QuerySuggestionBoxStyle"
+        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Padding" Value="0,2,42,0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="24" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="Foreground" Value="#8f8c8f" />
+    </Style>
+
+    <Style
+        x:Key="WindowBorderStyle"
+        BasedOn="{StaticResource BaseWindowBorderStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="#bcbabd" />
+        <Setter Property="Background" Value="#edebee" />
+        <Setter Property="CornerRadius" Value="6" />
+        <Setter Property="UseLayoutRounding" Value="True" />
+    </Style>
+    <Style
+        x:Key="WindowStyle"
+        BasedOn="{StaticResource BaseWindowStyle}"
+        TargetType="{x:Type Window}" />
+    <Style
+        x:Key="PendingLineStyle"
+        BasedOn="{StaticResource BasePendingLineStyle}"
+        TargetType="{x:Type Line}" />
+
+    <!--  Item Style  -->
+    <Style
+        x:Key="ItemTitleStyle"
+        BasedOn="{StaticResource BaseItemTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Foreground" Value="#100f0f" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleStyle"
+        BasedOn="{StaticResource BaseItemSubTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="10" />
+        <Setter Property="Foreground" Value="#8f8d90" />
+    </Style>
+    <Style
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="#dedcde" />
+        <Setter Property="Height" Value="1" />
+        <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="Foreground" Value="#100f0f" />
+    </Style>
+    <Style
+        x:Key="ItemSubTitleSelectedStyle"
+        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="10" />
+        <Setter Property="Foreground" Value="#8f8d90" />
+    </Style>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#d6d4d7</SolidColorBrush>
+
+    <!--  button style in the middle of the scrollbar  -->
+    <Style
+        x:Key="ThumbStyle"
+        BasedOn="{StaticResource BaseThumbStyle}"
+        TargetType="{x:Type Thumb}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border
+                        Width="4"
+                        Margin="0,0,2,0"
+                        Background="#878687"
+                        BorderBrush="Transparent"
+                        BorderThickness="0"
+                        CornerRadius="2"
+                        DockPanel.Dock="Right" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style
+        x:Key="ScrollBarStyle"
+        BasedOn="{StaticResource BaseScrollBarStyle}"
+        TargetType="{x:Type ScrollBar}" />
+    <Style
+        x:Key="SearchIconStyle"
+        BasedOn="{StaticResource BaseSearchIconStyle}"
+        TargetType="{x:Type Path}">
+        <Setter Property="Fill" Value="#d5d3d6" />
+        <Setter Property="Width" Value="24" />
+        <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="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="HorizontalAlignment" Value="Right" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#8f8d90" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#8f8d90" />
+    </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" />
+    </Style>
+    <CornerRadius x:Key="ItemRadius">6</CornerRadius>
+    <Thickness x:Key="ItemMargin">4 0 4 0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 4</Thickness>
+    <Style
+        x:Key="ClockPanel"
+        BasedOn="{StaticResource ClockPanel}"
+        TargetType="{x:Type StackPanel}">
+        <Setter Property="Orientation" Value="Horizontal" />
+        <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="#8f8d90" />
+        <Setter Property="Margin" Value="0,0,10,0" />
+    </Style>
+    <Style
+        x:Key="DateBox"
+        BasedOn="{StaticResource BaseDateBox}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Foreground" Value="#8f8d90" />
+    </Style>
+    <Style
+        x:Key="PreviewBorderStyle"
+        BasedOn="{StaticResource BasePreviewBorderStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Margin" Value="0,0,10,8" />
+        <Setter Property="BorderBrush" Value="#dedcde" />
+    </Style>
+    <Style
+        x:Key="PreviewItemTitleStyle"
+        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#100f0f" />
+    </Style>
+    <Style
+        x:Key="PreviewItemSubTitleStyle"
+        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#8f8d90" />
+    </Style>
+    <Style
+        x:Key="PreviewGlyph"
+        BasedOn="{StaticResource BasePreviewGlyph}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#100f0f" />
+    </Style>
+</ResourceDictionary>

From f109fb8a3c3386337b948e5a3aca0a842b8ff42a Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Sun, 8 Jan 2023 20:03:22 -0600
Subject: [PATCH 4/6] Notify MaxResultsToShow to trigger max height change when
 changing theme

---
 .../UserSettings/Settings.cs                       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 753334e2392..55c0d9973e4 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -13,6 +13,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
     public class Settings : BaseModel
     {
         private string language = "en";
+        private string _theme = Constant.DefaultTheme;
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
         public string ColorScheme { get; set; } = "System";
@@ -29,7 +30,18 @@ public string Language
                 OnPropertyChanged();
             }
         }
-        public string Theme { get; set; } = Constant.DefaultTheme;
+        public string Theme
+        {
+            get => _theme;
+            set
+            {
+                if (value == _theme)
+                    return;
+                _theme = value;
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(MaxResultsToShow));
+            }
+        }
         public bool UseDropShadowEffect { get; set; } = false;
         public string QueryBoxFont { get; set; } = FontFamily.GenericSansSerif.Name;
         public string QueryBoxFontStyle { get; set; }

From 4a0891cac7e603fc4cf4e1b633bb94cbbf521eb7 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Mon, 9 Jan 2023 09:39:50 -0600
Subject: [PATCH 5/6] revise theme structure to achieve the property update

---
 Flow.Launcher.Core/Resource/Theme.cs          | 30 ++++++++++++-------
 .../ViewModel/SettingWindowViewModel.cs       |  1 -
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 872c4543edb..20180c3d0e3 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -82,13 +82,14 @@ public bool ChangeTheme(string theme)
             {
                 if (string.IsNullOrEmpty(path))
                     throw new DirectoryNotFoundException("Theme path can't be found <{path}>");
-
-                Settings.Theme = theme;
-
+                
                 // reload all resources even if the theme itself hasn't changed in order to pickup changes
                 // to things like fonts
-                UpdateResourceDictionary(GetResourceDictionary());
+                UpdateResourceDictionary(GetResourceDictionary(theme));
+                
+                Settings.Theme = theme;
 
+                
                 //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
                 if (_oldTheme != theme || theme == defaultTheme)
                 {
@@ -134,9 +135,9 @@ private void UpdateResourceDictionary(ResourceDictionary dictionaryToUpdate)
             _oldResource = dictionaryToUpdate;
         }
 
-        private ResourceDictionary CurrentThemeResourceDictionary()
+        private ResourceDictionary GetThemeResourceDictionary(string theme)
         {
-            var uri = GetThemePath(Settings.Theme);
+            var uri = GetThemePath(theme);
             var dict = new ResourceDictionary
             {
                 Source = new Uri(uri, UriKind.Absolute)
@@ -145,10 +146,12 @@ private ResourceDictionary CurrentThemeResourceDictionary()
             return dict;
         }
 
-        public ResourceDictionary GetResourceDictionary()
+        private ResourceDictionary CurrentThemeResourceDictionary() => GetThemeResourceDictionary(Settings.Theme);
+
+        public ResourceDictionary GetResourceDictionary(string theme)
         {
-            var dict = CurrentThemeResourceDictionary();
-           
+            var dict = GetThemeResourceDictionary(theme);
+            
             if (dict["QueryBoxStyle"] is Style queryBoxStyle &&
                 dict["QuerySuggestionBoxStyle"] is Style querySuggestionBoxStyle)
             {
@@ -200,6 +203,11 @@ public ResourceDictionary GetResourceDictionary()
             return dict;
         }
 
+        private ResourceDictionary GetCurrentResourceDictionary( )
+        {
+            return  GetResourceDictionary(Settings.Theme);
+        }
+
         public List<string> LoadAvailableThemes()
         {
             List<string> themes = new List<string>();
@@ -229,7 +237,7 @@ private string GetThemePath(string themeName)
 
         public void AddDropShadowEffectToCurrentTheme()
         {
-            var dict = GetResourceDictionary();
+            var dict = GetCurrentResourceDictionary();
 
             var windowBorderStyle = dict["WindowBorderStyle"] as Style;
 
@@ -273,7 +281,7 @@ public void AddDropShadowEffectToCurrentTheme()
 
         public void RemoveDropShadowEffectFromCurrentTheme()
         {
-            var dict = CurrentThemeResourceDictionary();
+            var dict = GetCurrentResourceDictionary();
             var windowBorderStyle = dict["WindowBorderStyle"] as Style;
 
             var effectSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.EffectProperty) as Setter;
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 0305b70e14e..b4d2cbfe918 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -407,7 +407,6 @@ public string SelectedTheme
             get { return Settings.Theme; }
             set
             {
-                Settings.Theme = value;
                 ThemeManager.Instance.ChangeTheme(value);
 
                 if (ThemeManager.Instance.BlurEnabled && Settings.UseDropShadowEffect)

From 48d319387690a6e1c7729141cb33ed9ab8ef47e5 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Mon, 9 Jan 2023 09:56:48 -0600
Subject: [PATCH 6/6] Fix spelling

---
 .github/actions/spelling/expect.txt           | 22 +++++++++++++++++++
 Flow.Launcher.Core/Resource/Theme.cs          | 21 ++++++++----------
 .../UserSettings/Settings.cs                  |  2 +-
 Flow.Launcher/MainWindow.xaml.cs              |  2 +-
 Flow.Launcher/ResultListBox.xaml              |  2 +-
 Flow.Launcher/SettingWindow.xaml              |  2 +-
 Flow.Launcher/Themes/Base.xaml                |  8 +++----
 Flow.Launcher/Themes/Dracula.xaml             |  2 +-
 Flow.Launcher/Themes/Win11Light.xaml          |  2 +-
 Flow.Launcher/Themes/Win11System.xaml         |  2 +-
 Flow.Launcher/ViewModel/MainViewModel.cs      | 10 ++++-----
 Flow.Launcher/ViewModel/ResultsViewModel.cs   | 10 ++++-----
 .../ViewModel/SettingWindowViewModel.cs       | 20 +++++++----------
 13 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index a91287cc034..04042a3a9e1 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -62,3 +62,25 @@ TobiasSekan
 Img
 img
 resx
+directx
+mvvm
+dlg
+ddd
+dddd
+clearlogfolder
+ACCENT_ENABLE_TRANSPARENTGRADIENT
+ACCENT_ENABLE_BLURBEHIND
+WCA_ACCENT_POLICY
+HGlobal
+dopusrt
+firefox
+msedge
+svgc
+ime
+zindex
+txb
+btn
+otf
+searchplugin
+Noresult
+wpftk
\ No newline at end of file
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 20180c3d0e3..96338cf6a1a 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -36,7 +36,7 @@ public Theme()
         {
             _themeDirectories.Add(DirectoryPath);
             _themeDirectories.Add(UserDirectoryPath);
-            MakesureThemeDirectoriesExist();
+            MakeSureThemeDirectoriesExist();
 
             var dicts = Application.Current.Resources.MergedDictionaries;
             _oldResource = dicts.First(d =>
@@ -55,20 +55,17 @@ public Theme()
             _oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);
         }
 
-        private void MakesureThemeDirectoriesExist()
+        private void MakeSureThemeDirectoriesExist()
         {
-            foreach (string dir in _themeDirectories)
+            foreach (var dir in _themeDirectories.Where(dir => !Directory.Exists(dir)))
             {
-                if (!Directory.Exists(dir))
+                try
                 {
-                    try
-                    {
-                        Directory.CreateDirectory(dir);
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Exception($"|Theme.MakesureThemeDirectoriesExist|Exception when create directory <{dir}>", e);
-                    }
+                    Directory.CreateDirectory(dir);
+                }
+                catch (Exception e)
+                {
+                    Log.Exception($"|Theme.MakesureThemeDirectoriesExist|Exception when create directory <{dir}>", e);
                 }
             }
         }
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 55c0d9973e4..bfd7e4b8757 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -226,7 +226,7 @@ public bool HideNotifyIcon
             }
         }
         public bool LeaveCmdOpen { get; set; }
-        public bool HideWhenDeactive { get; set; } = true;
+        public bool HideWhenDeactivated { get; set; } = true;
         public SearchWindowPositions SearchWindowPosition { get; set; } = SearchWindowPositions.MouseScreenCenter;
         public bool IgnoreHotkeysOnFullscreen { get; set; }
 
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index b2d842022f6..550648b2479 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -485,7 +485,7 @@ private async void OnDeactivated(object sender, EventArgs e)
                 if (_settings.UseAnimation)
                     await Task.Delay(100);
 
-                if (_settings.HideWhenDeactive)
+                if (_settings.HideWhenDeactivated)
                 {
                     _viewModel.Hide();
                 }
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index dd3fb63ec83..ba4c9e9a451 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -27,7 +27,7 @@
     Style="{DynamicResource BaseListboxStyle}"
     VirtualizingStackPanel.IsVirtualizing="True"
     VirtualizingStackPanel.VirtualizationMode="Standard"
-    Visibility="{Binding Visbility}"
+    Visibility="{Binding Visibility}"
     mc:Ignorable="d">
     <!--  IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083  -->
 
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index d26680edde0..daf8ec608c4 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -673,7 +673,7 @@
                                     <ui:ToggleSwitch
                                         Grid.Column="2"
                                         FocusVisualMargin="5"
-                                        IsOn="{Binding Settings.HideWhenDeactive}"
+                                        IsOn="{Binding Settings.HideWhenDeactivated}"
                                         Style="{DynamicResource SideToggleSwitch}" />
                                 </ItemsControl>
                             </Border>
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 08a1d5add3f..84b979194e6 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -6,7 +6,7 @@
     <CornerRadius x:Key="ItemRadius">0</CornerRadius>
     <Thickness x:Key="ItemMargin">0</Thickness>
     <Thickness x:Key="ResultMargin">0</Thickness>
-    <!--  Further font customisations are dynamically loaded in Theme.cs  -->
+    <!--  Further font customizations are dynamically loaded in Theme.cs  -->
 
     <system:Double x:Key="ResultItemHeight">52</system:Double>
 
@@ -307,7 +307,7 @@
                 Content="{TemplateBinding Content}"
                 ContentTemplate="{TemplateBinding ContentTemplate}" />
 
-            <!--  Scrollbar in thr rigth of ScrollViewer  -->
+            <!--  Scrollbar in the right of ScrollViewer  -->
             <ScrollBar
                 x:Name="PART_VerticalScrollBar"
                 Grid.Row="0"
@@ -391,7 +391,7 @@
         <Setter Property="FontSize" Value="15" />
         <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
-    <Style x:Key="BaseItemHotkeySelecetedStyle" TargetType="{x:Type TextBlock}">
+    <Style x:Key="BaseItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="15" />
         <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
@@ -509,7 +509,7 @@
     </Style>
     <Style
         x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
+        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="15" />
         <Setter Property="Foreground" Value="#8f8f8f" />
diff --git a/Flow.Launcher/Themes/Dracula.xaml b/Flow.Launcher/Themes/Dracula.xaml
index ce335072862..d150e7355fe 100644
--- a/Flow.Launcher/Themes/Dracula.xaml
+++ b/Flow.Launcher/Themes/Dracula.xaml
@@ -106,7 +106,7 @@
     </Style>
     <Style
         x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
+        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
         <Setter Property="Foreground" Value="#ff79c6" />
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index e2c37236cbf..e6f376f8b34 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -120,7 +120,7 @@
     </Style>
     <Style
         x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
+        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
         <Setter Property="Foreground" Value="#acacac" />
diff --git a/Flow.Launcher/Themes/Win11System.xaml b/Flow.Launcher/Themes/Win11System.xaml
index df09249beb6..3025f9a07e2 100644
--- a/Flow.Launcher/Themes/Win11System.xaml
+++ b/Flow.Launcher/Themes/Win11System.xaml
@@ -113,7 +113,7 @@
     </Style>
     <Style
         x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
+        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
         <Setter Property="Foreground" Value="{DynamicResource HotkeySelectedForeground}" />
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 5f6f0f1f79b..71b0d02373b 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -535,13 +535,13 @@ private ResultsViewModel SelectedResults
                 _selectedResults = value;
                 if (SelectedIsFromQueryResults())
                 {
-                    ContextMenu.Visbility = Visibility.Collapsed;
-                    History.Visbility = Visibility.Collapsed;
+                    ContextMenu.Visibility = Visibility.Collapsed;
+                    History.Visibility = Visibility.Collapsed;
                     ChangeQueryText(_queryTextBeforeLeaveResults);
                 }
                 else
                 {
-                    Results.Visbility = Visibility.Collapsed;
+                    Results.Visibility = Visibility.Collapsed;
                     _queryTextBeforeLeaveResults = QueryText;
 
 
@@ -559,7 +559,7 @@ private ResultsViewModel SelectedResults
                     }
                 }
 
-                _selectedResults.Visbility = Visibility.Visible;
+                _selectedResults.Visibility = Visibility.Visible;
             }
         }
 
@@ -710,7 +710,7 @@ private async void QueryResults()
             if (query == null) // shortcut expanded
             {
                 Results.Clear();
-                Results.Visbility = Visibility.Collapsed;
+                Results.Visibility = Visibility.Collapsed;
                 PluginIconPath = null;
                 SearchIconVisibility = Visibility.Visible;
                 return;
diff --git a/Flow.Launcher/ViewModel/ResultsViewModel.cs b/Flow.Launcher/ViewModel/ResultsViewModel.cs
index e84fe03c504..bb07ce085e8 100644
--- a/Flow.Launcher/ViewModel/ResultsViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultsViewModel.cs
@@ -49,7 +49,7 @@ public ResultsViewModel(Settings settings) : this()
 
         public ResultViewModel SelectedItem { get; set; }
         public Thickness Margin { get; set; }
-        public Visibility Visbility { get; set; } = Visibility.Collapsed;
+        public Visibility Visibility { get; set; } = Visibility.Collapsed;
         
         public ICommand RightClickResultCommand { get; init; }
         public ICommand LeftClickResultCommand { get; init; }
@@ -167,14 +167,14 @@ private void UpdateResults(List<ResultViewModel> newResults, CancellationToken t
                     SelectedItem = Results[0];
             }
 
-            switch (Visbility)
+            switch (Visibility)
             {
                 case Visibility.Collapsed when Results.Count > 0:
                     SelectedIndex = 0;
-                    Visbility = Visibility.Visible;
+                    Visibility = Visibility.Visible;
                     break;
                 case Visibility.Visible when Results.Count == 0:
-                    Visbility = Visibility.Collapsed;
+                    Visibility = Visibility.Collapsed;
                     break;
             }
         }
@@ -259,7 +259,7 @@ public void BulkAddAll(List<ResultViewModel> resultViews)
                     return;
 
                 // manually update event
-                // wpf use directx / double buffered already, so just reset all won't cause ui flickering
+                // wpf use DirectX / double buffered already, so just reset all won't cause ui flickering
                 OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
             }
             private void AddAll(List<ResultViewModel> Items)
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index b4d2cbfe918..37587ce5949 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -325,18 +325,14 @@ public string TestProxy()
 
         public IList<PluginViewModel> PluginViewModels
         {
-            get
-            {
-                var metadatas = PluginManager.AllPlugins
-                    .OrderBy(x => x.Metadata.Disabled)
-                    .ThenBy(y => y.Metadata.Name)
-                    .Select(p => new PluginViewModel
-                    {
-                        PluginPair = p
-                    })
-                    .ToList();
-                return metadatas;
-            }
+            get => PluginManager.AllPlugins
+                .OrderBy(x => x.Metadata.Disabled)
+                .ThenBy(y => y.Metadata.Name)
+                .Select(p => new PluginViewModel
+                {
+                    PluginPair = p
+                })
+                .ToList();
         }
 
         public IList<PluginStoreItemViewModel> ExternalPlugins