Merge pull request #295 from taooceros/ProgressBarOpt

Stop ProgressBar animation when Flow is hidden

Author: jjw24

Flow.Launcher/MainWindow.xaml

@@ -97,7 +97,7 @@
                                      Background="Transparent"/>
                 </Grid>
                 <Line x:Name="ProgressBar" HorizontalAlignment="Right"
-                  Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay}" 
+                  Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
                   Y1="0" Y2="0" X2="100" Height="2" Width="752" StrokeThickness="1">
                 </Line>
                 <ContentControl>

Flow.Launcher/MainWindow.xaml.cs

@@ -26,6 +26,7 @@ public partial class MainWindow
         #region Private Fields
 
         private readonly Storyboard _progressBarStoryboard = new Storyboard();
+        private bool isProgressBarStoryboardPaused;
         private Settings _settings;
         private NotifyIcon _notifyIcon;
         private MainViewModel _viewModel;
@@ -52,7 +53,7 @@ private void OnClosing(object sender, CancelEventArgs e)
 
         private void OnInitialized(object sender, EventArgs e)
         {
-            
+
         }
 
         private void OnLoaded(object sender, RoutedEventArgs _)
@@ -73,7 +74,7 @@ private void OnLoaded(object sender, RoutedEventArgs _)
             {
                 if (e.PropertyName == nameof(MainViewModel.MainWindowVisibility))
                 {
-                    if (Visibility == Visibility.Visible)
+                    if (_viewModel.MainWindowVisibility == Visibility.Visible)
                     {
                         Activate();
                         QueryTextBox.Focus();
@@ -84,7 +85,34 @@ private void OnLoaded(object sender, RoutedEventArgs _)
                             QueryTextBox.SelectAll();
                             _viewModel.LastQuerySelected = true;
                         }
+
+                        if (_viewModel.ProgressBarVisibility == Visibility.Visible && isProgressBarStoryboardPaused)
+                        {
+                            _progressBarStoryboard.Resume();
+                            isProgressBarStoryboardPaused = false;
+                        }
                     }
+                    else if (!isProgressBarStoryboardPaused)
+                    {
+                        _progressBarStoryboard.Pause();
+                        isProgressBarStoryboardPaused = true;
+                    }
+                }
+                else if (e.PropertyName == nameof(MainViewModel.ProgressBarVisibility))
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        if (_viewModel.ProgressBarVisibility == Visibility.Hidden && !isProgressBarStoryboardPaused)
+                        {
+                            _progressBarStoryboard.Pause();
+                            isProgressBarStoryboardPaused = true;
+                        }
+                        else if (_viewModel.MainWindowVisibility == Visibility.Visible && isProgressBarStoryboardPaused)
+                        {
+                            _progressBarStoryboard.Resume();
+                            isProgressBarStoryboardPaused = false;
+                        }
+                    }, System.Windows.Threading.DispatcherPriority.Render);
                 }
             };
             _settings.PropertyChanged += (o, e) =>
@@ -170,6 +198,7 @@ private void InitProgressbarAnimation()
             _progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever;
             ProgressBar.BeginStoryboard(_progressBarStoryboard);
             _viewModel.ProgressBarVisibility = Visibility.Hidden;
+            isProgressBarStoryboardPaused = true;
         }
 
         private void OnMouseDown(object sender, MouseButtonEventArgs e)