From 04aea73d0cc90bffa1ddc4accf771d4feee0430b Mon Sep 17 00:00:00 2001
From: Dobin Park <onesound@oooz.net>
Date: Thu, 7 Oct 2021 21:34:42 +0900
Subject: [PATCH 1/2] - Fix ProgressBar (Finally!)

---
 Flow.Launcher/MainWindow.xaml    | 4 ++--
 Flow.Launcher/MainWindow.xaml.cs | 4 ++--
 Flow.Launcher/SettingWindow.xaml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index db015392a19..73b13be8c95 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -101,11 +101,11 @@
                     </Canvas>
                 </Grid>
 
-                <Grid>
+                <Grid ClipToBounds="True">
                     <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" />
                     <Line x:Name="ProgressBar" HorizontalAlignment="Right"
                   Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                  Y1="0" Y2="0" X1="0" X2="100" Height="2" Width="752" StrokeThickness="1">
+                  Y1="0" Y2="0" X1="-150" X2="-50" Height="2" Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}},Path=ActualWidth}" StrokeThickness="1">
                     </Line>
                 </Grid>
 
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 95e7ed6a82d..e84a3148e2d 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -207,9 +207,9 @@ private void InitializeNotifyIcon()
 
         private void InitProgressbarAnimation()
         {
-            var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 100,
+            var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 150,
                 new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
-            var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth, new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
+            var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 50, new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
             Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)"));
             Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)"));
             _progressBarStoryboard.Children.Add(da);
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 7dc8829bec7..2a552e7d821 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -447,7 +447,7 @@
                                             <TextBlock Text="{Binding PluginPair.Metadata.Name}" TextWrapping="Wrap" ToolTip="{Binding PluginPair.Metadata.Version}" />
                                             <TextBlock Opacity="0.5" TextWrapping="Wrap" Margin="0 2 0 0">
                                             <Run Text="{Binding PluginPair.Metadata.Version}"/>
-                                            </TextBlock>
+                                            </TextBlock>a
                                         </StackPanel>
                                     </Grid>
                                 </DockPanel>

From c7ab6c05b9537cecbaa0f7b9ced0b620d68f992b Mon Sep 17 00:00:00 2001
From: Dobin Park <onesound@oooz.net>
Date: Thu, 14 Oct 2021 15:28:15 +0900
Subject: [PATCH 2/2] Fix Querybar text invade magnifying glass area (This is
 due to the problem that the size of the window changes when the shadow is
 turned on.) - remove all querybox/suggest querybox width of themes - Add
 padding for Magnifying glass area

---
 Flow.Launcher/Themes/Base.xaml         | 10 ++++------
 Flow.Launcher/Themes/Discord Dark.xaml |  4 ++--
 Flow.Launcher/Themes/League.xaml       |  4 ++--
 Flow.Launcher/Themes/Metro Server.xaml |  2 ++
 Flow.Launcher/Themes/Sublime.xaml      |  6 ++----
 Flow.Launcher/Themes/Win10Light.xaml   |  6 ++----
 Flow.Launcher/Themes/Win11Dark.xaml    |  6 ++----
 Flow.Launcher/Themes/Win11Light.xaml   |  6 ++----
 8 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index fba804b10ec..19612af7058 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -8,14 +8,13 @@
         <Setter Property="FontSize" Value="28" />
         <Setter Property="FontWeight" Value="Regular" />
         <Setter Property="Margin" Value="16 7 0 7" />
-        <Setter Property="Padding" Value="0 4 0 0" />
+        <Setter Property="Padding" Value="0 4 68 0" />
         <Setter Property="Background" Value="#2F2F2F" />
-        <Setter Property="Width" Value="664" />
         <Setter Property="Height" Value="48" />
         <Setter Property="Foreground" Value="#E3E0E3" />
         <Setter Property="CaretBrush" Value="#E3E0E3" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
@@ -42,10 +41,9 @@
         <Setter Property="Foreground" Value="DarkGray" />
         <Setter Property="Height" Value="48" />
         <Setter Property="Margin" Value="16 7 0 7" />
-        <Setter Property="Width" Value="664" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Padding" Value="0 4 0 0" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Padding" Value="0 4 68 0" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
diff --git a/Flow.Launcher/Themes/Discord Dark.xaml b/Flow.Launcher/Themes/Discord Dark.xaml
index aa1067bcadb..636fe7b6d38 100644
--- a/Flow.Launcher/Themes/Discord Dark.xaml	
+++ b/Flow.Launcher/Themes/Discord Dark.xaml	
@@ -12,16 +12,16 @@
         <Setter Property="Background" Value="#36393f" />
         <Setter Property="CaretBrush" Value="#ffffff" />
         <Setter Property="SelectionBrush" Value="#0a68d8"/>
-        <Setter Property="Width" Value="490" />
         <Setter Property="Height" Value="42" />
         <Setter Property="FontSize" Value="24" />
+        <Setter Property="Padding" Value="0 0 66 0" />
     </Style>
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="#72767d" />
         <Setter Property="Background" Value="#36393f" />
-        <Setter Property="Width" Value="490" />
         <Setter Property="Height" Value="42" />
         <Setter Property="FontSize" Value="24" />
+        <Setter Property="Padding" Value="0 0 66 0" />
     </Style>
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="2" />
diff --git a/Flow.Launcher/Themes/League.xaml b/Flow.Launcher/Themes/League.xaml
index f57457d78cc..06649978bd9 100644
--- a/Flow.Launcher/Themes/League.xaml
+++ b/Flow.Launcher/Themes/League.xaml
@@ -6,7 +6,7 @@
         <Setter Property="Background" Value="#161614"/>
         <Setter Property="Foreground" Value="#b88f3a" />
         <Setter Property="CaretBrush" Value="#b88f3a" />
-        <Setter Property="Width" Value="490" />
+        <Setter Property="Padding" Value="0 0 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
     <Style x:Key="ItemGlyph"  BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}">
@@ -15,7 +15,7 @@
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">    
         <Setter Property="Background" Value="#161614"/>
         <Setter Property="Foreground" Value="#a09b8c" />
-        <Setter Property="Width" Value="490" />
+        <Setter Property="Padding" Value="0 0 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
 
diff --git a/Flow.Launcher/Themes/Metro Server.xaml b/Flow.Launcher/Themes/Metro Server.xaml
index f6a5326636a..016e6af9dd0 100644
--- a/Flow.Launcher/Themes/Metro Server.xaml	
+++ b/Flow.Launcher/Themes/Metro Server.xaml	
@@ -8,10 +8,12 @@
     <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="#FFFFFF" />
         <Setter Property="Background" Value="#001e4e"/>
+        <Setter Property="Padding" Value="0 0 18 0" />
     </Style>
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="#344c71" />
         <Setter Property="Background" Value="#001e4e" />
+        <Setter Property="Padding" Value="0 0 18 0" />
     </Style>
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
diff --git a/Flow.Launcher/Themes/Sublime.xaml b/Flow.Launcher/Themes/Sublime.xaml
index e50230f3395..82fff06ff84 100644
--- a/Flow.Launcher/Themes/Sublime.xaml
+++ b/Flow.Launcher/Themes/Sublime.xaml
@@ -13,17 +13,15 @@
         <Setter Property="Foreground" Value="#d2d8e5" />
         <Setter Property="CaretBrush" Value="#FFAA47" />
         <Setter Property="FontSize" Value="26" />
-        <Setter Property="Width" Value="490" />
         <Setter Property="Height" Value="42" />
-        <Setter Property="Padding" Value="0 4 0 0" />
+        <Setter Property="Padding" Value="0 4 66 0" />
     </Style>
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#303840" />
         <Setter Property="Foreground" Value="#798189" />
         <Setter Property="FontSize" Value="26" />
-        <Setter Property="Width" Value="490" />
         <Setter Property="Height" Value="42" />
-        <Setter Property="Padding" Value="0 4 0 0" />
+        <Setter Property="Padding" Value="0 4 66 0" />
     </Style>
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="2" />
diff --git a/Flow.Launcher/Themes/Win10Light.xaml b/Flow.Launcher/Themes/Win10Light.xaml
index 33dbeeb4d43..6f487a89521 100644
--- a/Flow.Launcher/Themes/Win10Light.xaml
+++ b/Flow.Launcher/Themes/Win10Light.xaml
@@ -16,16 +16,14 @@
         <Setter Property="BorderBrush" Value="Black"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="FontSize" Value="28" />
-        <Setter Property="Width" Value="490" />
         <Setter Property="Height" Value="42" />
-        <Setter Property="Padding" Value="0 4 0 0" />
+        <Setter Property="Padding" Value="0 4 66 0" />
     </Style>
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#dddddd" />
         <Setter Property="Foreground" Value="#c6c6c6" />
         <Setter Property="FontSize" Value="28" />
-        <Setter Property="Padding" Value="0 4 0 0" />
-        <Setter Property="Width" Value="490" />
+        <Setter Property="Padding" Value="0 4 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
diff --git a/Flow.Launcher/Themes/Win11Dark.xaml b/Flow.Launcher/Themes/Win11Dark.xaml
index a0ac25f9ee2..797241da068 100644
--- a/Flow.Launcher/Themes/Win11Dark.xaml
+++ b/Flow.Launcher/Themes/Win11Dark.xaml
@@ -14,16 +14,14 @@
         <Setter Property="Foreground" Value="#FFFFFF" />
         <Setter Property="CaretBrush" Value="#FFFFFF" />
         <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0 4 0 0" />
-        <Setter Property="Width" Value="490" />
+        <Setter Property="Padding" Value="0 4 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#202020" />
         <Setter Property="Foreground" Value="#7b7b7b" />
         <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0 4 0 0" />
-        <Setter Property="Width" Value="490" />
+        <Setter Property="Padding" Value="0 4 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index 6d5e41a187e..ca78fd6e6c2 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -14,16 +14,14 @@
         <Setter Property="Foreground" Value="#000000" />
         <Setter Property="CaretBrush" Value="#000000" />
         <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0 4 0 0" />
-        <Setter Property="Width" Value="490" />
+        <Setter Property="Padding" Value="0 4 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#f3f3f3" />
         <Setter Property="Foreground" Value="#b5b5b5" />
         <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0 4 0 0" />
-        <Setter Property="Width" Value="490" />
+        <Setter Property="Padding" Value="0 4 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">