|
29 | 29 | <converters:NullToTrueConverter x:Key="NullToFalseConverter" Inverse="True" /> |
30 | 30 | <converters:NullToVisibilityCollapsedConverter x:Key="NullToVisibilityCollapsedConverter" /> |
31 | 31 | <converters1:BoolNegationConverter x:Key="BoolNegationConverter" /> |
| 32 | + <converters:VisibilityInvertConverter x:Key="VisibilityInvertConverter" /> |
32 | 33 |
|
33 | 34 | <ResourceDictionary.MergedDictionaries> |
34 | 35 | <ResourceDictionary Source="ms-appx:///UserControls/KeyboardShortcut/KeyboardShortcut.xaml" /> |
|
478 | 479 | x:Name="StatusCenterIcon" |
479 | 480 | Width="16" |
480 | 481 | 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}" /> |
482 | 484 |
|
483 | 485 | <ProgressRing |
484 | 486 | x:Name="MedianOperationProgressRing" |
|
492 | 494 | x:Name="StatusInfoBadge" |
493 | 495 | HorizontalAlignment="Center" |
494 | 496 | VerticalAlignment="Center" |
495 | | - Visibility="{x:Bind OngoingTasksViewModel.HasAnyItemInProgress, Mode=OneWay}" |
| 497 | + Visibility="{x:Bind OngoingTasksViewModel.ShowProgressRing, Mode=OneWay}" |
496 | 498 | Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" /> |
497 | 499 | </Grid> |
498 | 500 |
|
|
625 | 627 | </VisualState.StateTriggers> |
626 | 628 | <VisualState.Setters> |
627 | 629 | <Setter Target="MedianOperationProgressRing.Background" Value="{ThemeResource SystemFillColorSuccessBrush}" /> |
| 630 | + <Setter Target="StatusInfoBadge.Style" Value="{StaticResource SuccessIconInfoBadgeStyle}" /> |
628 | 631 | </VisualState.Setters> |
629 | 632 | </VisualState> |
630 | 633 | <VisualState x:Name="TasksOnging"> |
|
662 | 665 | </VisualState.StateTriggers> |
663 | 666 | <VisualState.Setters> |
664 | 667 | <Setter Target="MedianOperationProgressRing.Background" Value="{ThemeResource SystemFillColorCriticalBrush}" /> |
| 668 | + <Setter Target="StatusCenterIcon.Visibility" Value="Collapsed" /> |
| 669 | + <Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalIconInfoBadgeStyle}" /> |
665 | 670 | </VisualState.Setters> |
666 | 671 | </VisualState> |
667 | 672 | </VisualStateGroup> |
|
0 commit comments