From 62112758e622e572a2f4ba7339390907d754a492 Mon Sep 17 00:00:00 2001
From: Dobin Park <onesound@oooz.net>
Date: Fri, 1 Oct 2021 21:22:15 +0900
Subject: [PATCH] - Fix Setting window preview (last item clip) - Fix Querybox
 Width - Fix Pink Theme Width - Change WinLight highlight

---
 Flow.Launcher/MainWindow.xaml        |  4 +--
 Flow.Launcher/SettingWindow.xaml     | 43 ++++++++++++++++++----------
 Flow.Launcher/Themes/Base.xaml       |  4 +--
 Flow.Launcher/Themes/Pink.xaml       |  5 ++--
 Flow.Launcher/Themes/Win10Light.xaml |  2 +-
 5 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 363f6f5c3..79e9d916a 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -70,7 +70,7 @@
                     <TextBox x:Name="QueryTextSuggestionBox"
                          Style="{DynamicResource QuerySuggestionBoxStyle}"
                          IsEnabled="False"
-                         Margin="16,0,66,0">
+                         Padding="16,0,60,0">
                         <TextBox.Text>
                             <MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
                                 <Binding ElementName="QueryTextBox" Path="Text"/>
@@ -85,7 +85,7 @@
                      AllowDrop="True"
                      Visibility="Visible"
                     Background="Transparent"
-                    Margin="16,0,66,0">
+                    Padding="16,0,60,0">
                         <TextBox.ContextMenu>
                             <ContextMenu>
                                 <MenuItem Command="ApplicationCommands.Cut"/>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 0f32f0626..52d3e9c64 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -3,6 +3,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:flowlauncher="clr-namespace:Flow.Launcher"
+        xmlns:converters="clr-namespace:Flow.Launcher.Converters"
         xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
         xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
         xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
@@ -28,6 +29,7 @@
         <CommandBinding Command="Close" Executed="OnCloseExecuted"/>
     </Window.CommandBindings>
     <Window.Resources>
+        <converters:BorderClipConverter x:Key="BorderClipConverter"/>
         <CollectionViewSource Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}" x:Key="SortedFonts">
             <CollectionViewSource.SortDescriptions>
                 <scm:SortDescription PropertyName="Source"/>
@@ -256,25 +258,36 @@
                         <StackPanel Orientation="Horizontal" Margin="0 30 0 0"
                                     HorizontalAlignment="Center" VerticalAlignment="Center">
                             <Border Width="500" Style="{DynamicResource WindowBorderStyle}" >
-                                <Grid>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="58" />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-                                    <TextBox Grid.Row="0"
+                                <Border Style="{DynamicResource WindowRadius}">
+                                    <Border.Clip>
+                                        <MultiBinding Converter="{StaticResource BorderClipConverter}">
+                                            <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
+                                            <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
+                                            <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}"/>
+                                        </MultiBinding>
+                                    </Border.Clip>
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="58" />
+                                            <RowDefinition />
+                                        </Grid.RowDefinitions>
+                                        <TextBox Grid.Row="0"
                                              Text="{DynamicResource hiThere}" IsReadOnly="True"
                                              Style="{DynamicResource QueryBoxStyle}"
                                              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 28 0 0">
-                                        <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" Visibility="visible"/>
+                                        <Canvas Style="{DynamicResource SearchIconPosition}">
+                                            <Path Data="{DynamicResource SearchIconImg}" Style="{DynamicResource SearchIconStyle}" Margin="0"  Stretch="Fill"/>
+                                        </Canvas>
+                                        <Border Height="58" Margin="0 28 0 0">
+                                            <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" Visibility="visible"/>
+                                        </Border>
+
+                                        <ContentControl Grid.Row="1">
+                                            <flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" />
+                                        </ContentControl>
+
                                     </Grid>
-                                    <ContentControl Grid.Row="1">
-                                        <flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" />
-                                    </ContentControl>
-                                </Grid>
+                                </Border>
                             </Border>
                         </StackPanel>
                     </StackPanel>
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 1be065bbb..59b67f1b9 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -10,7 +10,7 @@
         <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="Width" Value="586" />
         <Setter Property="Foreground" Value="#E3E0E3" />
         <Setter Property="CaretBrush" Value="#E3E0E3" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -39,7 +39,7 @@
     <!-- 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="Width" Value="56" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="0 4 0 0" />
         <Setter Property="HorizontalAlignment" Value="Left" />
diff --git a/Flow.Launcher/Themes/Pink.xaml b/Flow.Launcher/Themes/Pink.xaml
index a2225665e..1aec9a58d 100644
--- a/Flow.Launcher/Themes/Pink.xaml
+++ b/Flow.Launcher/Themes/Pink.xaml
@@ -6,18 +6,17 @@
         <Setter Property="Background" Value="#1f1d1f"/>
         <Setter Property="Foreground" Value="#cc1081" />
         <Setter Property="CaretBrush" Value="#cc1081" />
-        <Setter Property="Width" Value="370"/>
+        <Setter Property="SelectionBrush" Value="#e564b1"/>
     </Style>
 
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#1f1d1f"/>
         <Setter Property="Foreground" Value="#71114b" />
-        <Setter Property="Width" Value="370"/>
     </Style>
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
         <Setter Property="Background" Value="#1f1d1f"></Setter>
-        <Setter Property="Width" Value="456"></Setter>
+        <Setter Property="Width" Value="586"></Setter>
          <Setter Property="BorderThickness" Value="2"></Setter>
         <Setter Property="BorderBrush" Value="#000000"></Setter>
     </Style>
diff --git a/Flow.Launcher/Themes/Win10Light.xaml b/Flow.Launcher/Themes/Win10Light.xaml
index 46e01491c..4ad385a0a 100644
--- a/Flow.Launcher/Themes/Win10Light.xaml
+++ b/Flow.Launcher/Themes/Win10Light.xaml
@@ -58,7 +58,7 @@
         <Setter Property="Cursor" Value="Arrow" />
     </Style>
     <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.FontWeight" Value="Bold" />
+        <Setter Property="Inline.Foreground" Value="#0078d7" />
     </Style>
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="15" />