Skip to content

Commit 3fe23f9

Browse files
authored
Show ongoing tasks button if there are any banners (#5970)
1 parent 4b5bf4a commit 3fe23f9

File tree

3 files changed

+29
-1
lines changed

3 files changed

+29
-1
lines changed

Files/UserControls/NavigationToolbar.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@
515515
</Button.KeyboardAccelerators>
516516
</Button>
517517

518-
<Grid x:Name="OngoingTasksGrid" Visibility="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}">
518+
<Grid x:Name="OngoingTasksGrid" Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
519519
<Button
520520
x:Name="OngoingTasks"
521521
Width="36"

Files/ViewModels/ItemViewModel.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,23 @@ public ItemViewModel(FolderSettingsViewModel folderSettingsViewModel)
356356
shouldDisplayFileExtensions = App.AppSettings.ShowFileExtensions;
357357

358358
AppServiceConnectionHelper.ConnectionChanged += AppServiceConnectionHelper_ConnectionChanged;
359+
AppSettings.PropertyChanged += AppSettings_PropertyChanged;
360+
}
361+
362+
private async void AppSettings_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
363+
{
364+
switch (e.PropertyName)
365+
{
366+
case nameof(AppSettings.ShowFileExtensions):
367+
case nameof(AppSettings.AreHiddenItemsVisible):
368+
case nameof(AppSettings.AreSystemItemsHidden):
369+
case nameof(AppSettings.AreFileTagsEnabled):
370+
await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>
371+
{
372+
RefreshItems(null);
373+
});
374+
break;
375+
}
359376
}
360377

361378
private async void AppServiceConnectionHelper_ConnectionChanged(object sender, Task<NamedPipeAsAppServiceConnection> e)
@@ -2131,6 +2148,7 @@ public void Dispose()
21312148
Connection.RequestReceived -= Connection_RequestReceived;
21322149
}
21332150
AppServiceConnectionHelper.ConnectionChanged -= AppServiceConnectionHelper_ConnectionChanged;
2151+
AppSettings.PropertyChanged -= AppSettings_PropertyChanged;
21342152
}
21352153
}
21362154

Files/ViewModels/StatusCenterViewModel.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ public class OngoingTasksViewModel : ObservableObject, IOngoingTasksActions
2525

2626
private float medianOperationProgressValue = 0.0f;
2727

28+
public OngoingTasksViewModel()
29+
{
30+
StatusBannersSource.CollectionChanged += (s, e) => OnPropertyChanged(nameof(AnyBannersPresent));
31+
}
32+
2833
public float MedianOperationProgressValue
2934
{
3035
get => medianOperationProgressValue;
@@ -54,6 +59,11 @@ public bool AnyOperationsOngoing
5459
get => OngoingOperationsCount > 0;
5560
}
5661

62+
public bool AnyBannersPresent
63+
{
64+
get => StatusBannersSource.Any();
65+
}
66+
5767
#endregion Public Properties
5868

5969
#region Events

0 commit comments

Comments
 (0)