From 797ff90195b9422d3eca9d3195384a017c26d504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BC=98=E9=9F=AC?= Date: Tue, 15 Jun 2021 16:41:27 +0800 Subject: [PATCH] fix storyboard animation control --- Flow.Launcher/MainWindow.xaml.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 04a1063f8..49e14fa46 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -88,13 +88,13 @@ namespace Flow.Launcher if (_viewModel.ProgressBarVisibility == Visibility.Visible && isProgressBarStoryboardPaused) { - _progressBarStoryboard.Resume(); + _progressBarStoryboard.Resume(ProgressBar); isProgressBarStoryboardPaused = false; } } else if (!isProgressBarStoryboardPaused) { - _progressBarStoryboard.Pause(); + _progressBarStoryboard.Pause(ProgressBar); isProgressBarStoryboardPaused = true; } } @@ -104,12 +104,13 @@ namespace Flow.Launcher { if (_viewModel.ProgressBarVisibility == Visibility.Hidden && !isProgressBarStoryboardPaused) { - _progressBarStoryboard.Pause(); + _progressBarStoryboard.Pause(ProgressBar); isProgressBarStoryboardPaused = true; } else if (_viewModel.MainWindowVisibility == Visibility.Visible && isProgressBarStoryboardPaused) { - _progressBarStoryboard.Resume(); + + _progressBarStoryboard.Resume(ProgressBar); isProgressBarStoryboardPaused = false; } }, System.Windows.Threading.DispatcherPriority.Render); @@ -196,7 +197,10 @@ namespace Flow.Launcher _progressBarStoryboard.Children.Add(da); _progressBarStoryboard.Children.Add(da1); _progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever; - ProgressBar.BeginStoryboard(_progressBarStoryboard); + + _progressBarStoryboard.Begin(ProgressBar, true); + _progressBarStoryboard.Pause(); + _viewModel.ProgressBarVisibility = Visibility.Hidden; isProgressBarStoryboardPaused = true; }