Skip to content

Stop ProgressBar animation when Flow is hidden #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 24, 2021
Merged

Stop ProgressBar animation when Flow is hidden #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5688f37
Stop ProgressBar animation when Flow is hidden
taooceros Jan 15, 2021
0730956
Make pause and resume when progressbarvisibility changed.
taooceros Jan 19, 2021
5d1790c
change visibility from ProgressBar.Visibility to _viewModel.ProgressB…
taooceros Jan 21, 2021
2db3f82
change logic
taooceros Jan 22, 2021
337e3bb
Merge branch 'dev' into ProgressBarOpt
jjw24 Jan 24, 2021
db63833
add condition for progress bar to control pause and resume
jjw24 Jan 24, 2021
36e6f5e
Use _viewModel.MainWindowVisibility instead of Visibility
taooceros Jan 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Flow.Launcher/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
33 changes: 31 additions & 2 deletions Flow.Launcher/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -52,7 +53,7 @@ private void OnClosing(object sender, CancelEventArgs e)

private void OnInitialized(object sender, EventArgs e)
{

}

private void OnLoaded(object sender, RoutedEventArgs _)
Expand All @@ -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();
Expand All @@ -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();
Copy link
Member

@jjw24 jjw24 Jan 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going to be called everytime the mainwindow is hidden, how come a check is not added here?

Copy link
Member

@jjw24 jjw24 Jan 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in db63833

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) =>
Expand Down Expand Up @@ -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)
Expand Down