From 8eba28fae5111d9de64be050ade948497aee35ec Mon Sep 17 00:00:00 2001
From: Dobin Park <onesound@oooz.net>
Date: Tue, 28 Sep 2021 22:07:07 +0900
Subject: [PATCH] - fix the theme preview in setting window

---
 Flow.Launcher/SettingWindow.xaml    | 16 ++++++++++------
 Flow.Launcher/Themes/Win11Dark.xaml | 17 +++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 38168a66c..a2bb8ff67 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -253,20 +253,24 @@
                         </Grid>
                     </StackPanel>
                     <StackPanel Background="{Binding PreviewBackground}" Grid.Row="1" Margin="0">
-                        <StackPanel Orientation="Horizontal" Margin="10"
+                        <StackPanel Orientation="Horizontal" Margin="0 30 0 0"
                                     HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <Border Width="500" Style="{DynamicResource WindowBorderStyle}" CornerRadius="5">
+                            <Border Width="500" Style="{DynamicResource WindowBorderStyle}" >
                                 <Grid>
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="50" />
+                                        <RowDefinition Height="58" />
                                         <RowDefinition />
                                     </Grid.RowDefinitions>
                                     <TextBox Grid.Row="0"
                                              Text="{DynamicResource hiThere}" IsReadOnly="True"
                                              Style="{DynamicResource QueryBoxStyle}"
-                                             Margin="18 0 56 0" />
-                                    <svgc:SvgControl Source="{Binding ThemeImage}" Height="48" Width="48" HorizontalAlignment="Right" 
-                                                     Background="Transparent" />
+                                             Margin="16 0 56 0" />
+                                    <Canvas Style="{DynamicResource SearchIconPosition}">
+                                        <Path Data="{DynamicResource SearchIconImg}" Style="{DynamicResource SearchIconStyle}" Margin="0"  Stretch="Fill"/>
+                                    </Canvas>
+                                    <Grid Height="58" Margin="0 30 0 0">
+                                        <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" Visibility="visible"/>
+                                    </Grid>
                                     <ContentControl Grid.Row="1">
                                         <flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" />
                                     </ContentControl>
diff --git a/Flow.Launcher/Themes/Win11Dark.xaml b/Flow.Launcher/Themes/Win11Dark.xaml
index 78f3e0ce8..8f995264c 100644
--- a/Flow.Launcher/Themes/Win11Dark.xaml
+++ b/Flow.Launcher/Themes/Win11Dark.xaml
@@ -239,6 +239,14 @@
         <Setter Property="Inline.FontWeight" Value="Bold" />
 
     </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>
     <Style x:Key="SeparatorStyle" BasedOn="{StaticResource BaseSeparatorStyle}" TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="#9a9a9a"/>
         <Setter Property="Height" Value="1"/>
@@ -248,13 +256,6 @@
         <Setter Property="FontSize" Value="13" />
         <Setter Property="Foreground" Value="#7b7b7b" />
     </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>