From 1e28df79fe27f7d9b77188f09a99f4174ba3e550 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 15 Dec 2022 10:23:55 +0900
Subject: [PATCH 1/3] Fix loading-bar margin when no-item situation

---
 Flow.Launcher/MainWindow.xaml    | 5 ++++-
 Flow.Launcher/ResultListBox.xaml | 1 -
 Flow.Launcher/Themes/Base.xaml   | 9 +++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index baf96e01c..060312a8d 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -180,7 +180,10 @@
             Modifiers="{Binding OpenResultCommandModifiers}" />
     </Window.InputBindings>
     <Grid>
-        <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">
+        <Border
+            ClipToBounds="True"
+            MouseDown="OnMouseDown"
+            Style="{DynamicResource WindowBorderStyle}">
             <StackPanel Orientation="Vertical">
                 <Grid>
                     <Border Style="{DynamicResource QueryBoxBgStyle}">
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index b2b96aa00..8f3238303 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -7,7 +7,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
     MaxHeight="{Binding MaxHeight}"
-    Margin="{DynamicResource ResultMargin}"
     HorizontalContentAlignment="Stretch"
     d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
     d:DesignHeight="100"
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index c48da0bca..9f62b3e84 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -248,8 +248,9 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Margin" Value="{DynamicResource ResultMargin}" />
         <Setter Property="Padding" Value="0,0,0,0" />
+
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ListBox">
@@ -273,6 +274,11 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Items.Count}" Value="0">
+                <Setter Property="Margin" Value="0" />
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
     <!--  ScrollViewer Style  -->
@@ -360,7 +366,6 @@
         <Style.Triggers>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding ElementName=QueryTextBox, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0" />
                     <Condition Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Collapsed" />
                     <Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
                     <Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />

From 6959d86fe23b0e51ef13891c183b0e13f7af71bf Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 15 Dec 2022 10:46:52 +0900
Subject: [PATCH 2/3] Fix selected glyph in win10light

---
 Flow.Launcher/Themes/Win10Light.xaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Flow.Launcher/Themes/Win10Light.xaml b/Flow.Launcher/Themes/Win10Light.xaml
index 5f837bdb3..eaa66e7fd 100644
--- a/Flow.Launcher/Themes/Win10Light.xaml
+++ b/Flow.Launcher/Themes/Win10Light.xaml
@@ -12,6 +12,12 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#000000" />
     </Style>
+    <Style
+        x:Key="ItemGlyphSelectedStyle"
+        BasedOn="{StaticResource BaseGlyphStyle}"
+        TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#000000" />
+    </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"

From 6998d3acf42ccefddd007cea7c9ce67a5d454516 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 15 Dec 2022 10:55:18 +0900
Subject: [PATCH 3/3] Remove Clipbound

---
 Flow.Launcher/MainWindow.xaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 060312a8d..baf96e01c 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -180,10 +180,7 @@
             Modifiers="{Binding OpenResultCommandModifiers}" />
     </Window.InputBindings>
     <Grid>
-        <Border
-            ClipToBounds="True"
-            MouseDown="OnMouseDown"
-            Style="{DynamicResource WindowBorderStyle}">
+        <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">
             <StackPanel Orientation="Vertical">
                 <Grid>
                     <Border Style="{DynamicResource QueryBoxBgStyle}">