From 2fda16cfd4d2c5f69681a5d028baf96c77981da8 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 17 Dec 2022 14:11:01 +0900
Subject: [PATCH] Remove Progressbar / Add Progress Ring

---
 Flow.Launcher/MainWindow.xaml    | 22 ++++++++++------------
 Flow.Launcher/MainWindow.xaml.cs | 15 ++++++++-------
 Flow.Launcher/Themes/Base.xaml   |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index baf96e01c..29fe25670 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -261,6 +261,16 @@
                     </StackPanel>
                     <Border>
                         <Grid>
+                            <ui:ProgressRing
+                                x:Name="ProgressBar"
+                                Width="24"
+                                Height="24"
+                                Margin="0,0,68,0"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Panel.ZIndex="2"
+                                IsActive="true"
+                                Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                             <Image
                                 x:Name="PluginActivationIcon"
                                 Width="32"
@@ -310,18 +320,6 @@
                             HorizontalAlignment="Stretch"
                             Style="{DynamicResource SeparatorStyle}" />
                     </ContentControl>
-                    <Line
-                        x:Name="ProgressBar"
-                        Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}}, Path=ActualWidth}"
-                        Height="2"
-                        HorizontalAlignment="Right"
-                        StrokeThickness="1"
-                        Style="{DynamicResource PendingLineStyle}"
-                        Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                        X1="-150"
-                        X2="-50"
-                        Y1="0"
-                        Y2="0" />
                 </Grid>
                 <Grid>
                     <Grid.ColumnDefinitions>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 1689fa59d..8f592a89a 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -361,13 +361,14 @@ namespace Flow.Launcher
         }
         private void InitProgressbarAnimation()
         {
-            var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 150,
-                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);
-            _progressBarStoryboard.Children.Add(da1);
+
+            //var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 150,
+            //    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);
+            //_progressBarStoryboard.Children.Add(da1);
             _progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever;
 
             _viewModel.ProgressBarVisibility = Visibility.Hidden;
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index f5642314e..0b4460d46 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -366,7 +366,7 @@
         <Style.Triggers>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Collapsed" />
+                    <Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
                     <Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
                     <Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
                 </MultiDataTrigger.Conditions>