Skip to content

Commit 039271c

Browse files
committed
Concept
1 parent a4d9fc4 commit 039271c

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/Files.App/UserControls/NavigationToolbar.xaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<converters:NullToTrueConverter x:Key="NullToFalseConverter" Inverse="True" />
3030
<converters:NullToVisibilityCollapsedConverter x:Key="NullToVisibilityCollapsedConverter" />
3131
<converters1:BoolNegationConverter x:Key="BoolNegationConverter" />
32+
<converters:VisibilityInvertConverter x:Key="VisibilityInvertConverter" />
3233

3334
<ResourceDictionary.MergedDictionaries>
3435
<ResourceDictionary Source="ms-appx:///UserControls/KeyboardShortcut/KeyboardShortcut.xaml" />
@@ -478,7 +479,8 @@
478479
x:Name="StatusCenterIcon"
479480
Width="16"
480481
Height="16"
481-
Style="{StaticResource App.ThemedIcons.StatusCenter}" />
482+
Style="{StaticResource App.ThemedIcons.StatusCenter}"
483+
Visibility="{x:Bind OngoingTasksViewModel.ShowProgressRing, Converter={StaticResource VisibilityInvertConverter}, Mode=OneWay}" />
482484

483485
<ProgressRing
484486
x:Name="MedianOperationProgressRing"
@@ -492,7 +494,7 @@
492494
x:Name="StatusInfoBadge"
493495
HorizontalAlignment="Center"
494496
VerticalAlignment="Center"
495-
Visibility="{x:Bind OngoingTasksViewModel.HasAnyItemInProgress, Mode=OneWay}"
497+
Visibility="{x:Bind OngoingTasksViewModel.ShowProgressRing, Mode=OneWay}"
496498
Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
497499
</Grid>
498500

@@ -625,6 +627,7 @@
625627
</VisualState.StateTriggers>
626628
<VisualState.Setters>
627629
<Setter Target="MedianOperationProgressRing.Background" Value="{ThemeResource SystemFillColorSuccessBrush}" />
630+
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource SuccessIconInfoBadgeStyle}" />
628631
</VisualState.Setters>
629632
</VisualState>
630633
<VisualState x:Name="TasksOnging">
@@ -662,6 +665,8 @@
662665
</VisualState.StateTriggers>
663666
<VisualState.Setters>
664667
<Setter Target="MedianOperationProgressRing.Background" Value="{ThemeResource SystemFillColorCriticalBrush}" />
668+
<Setter Target="StatusCenterIcon.Visibility" Value="Collapsed" />
669+
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalIconInfoBadgeStyle}" />
665670
</VisualState.Setters>
666671
</VisualState>
667672
</VisualStateGroup>

src/Files.App/ViewModels/UserControls/StatusCenterViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public StatusCenterViewModel()
8383

8484
public void OnStatusCenterFlyoutOpened()
8585
{
86-
ShowProgressRing = HasAnyItemInProgress;
86+
ShowProgressRing = HasAnyItemInProgress || InfoBadgeState == 3;
8787
}
8888

8989
public StatusCenterItem AddItem(

0 commit comments

Comments
 (0)