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" />
474
475
Visibility=" {x:Bind ViewModel.ShowStatusCenterButton, Mode=OneWay}" >
475
476
476
477
<Grid Margin =" -16" >
477
-
478
478
<controls : ThemedIcon
479
479
x:Name=" StatusCenterIcon"
480
480
Width=" 16"
481
481
Height=" 16"
482
- x:Load =" {x:Bind OngoingTasksViewModel.HasAnyItem, Converter={ StaticResource BoolNegationConverter}, Mode=OneWay }"
483
- Style =" {StaticResource App.ThemedIcons.StatusCenter }" />
482
+ Style =" {StaticResource App.ThemedIcons.StatusCenter }"
483
+ Visibility =" {x:Bind OngoingTasksViewModel.ShowProgressRing, Converter={StaticResource VisibilityInvertConverter}, Mode=OneWay }" />
484
484
485
485
<ProgressRing
486
486
x:Name=" MedianOperationProgressRing"
487
487
HorizontalAlignment=" Center"
488
488
VerticalAlignment=" Center"
489
- x:Load=" {x:Bind OngoingTasksViewModel.HasAnyItemInProgress, Mode=OneWay}"
490
- Background=" {ThemeResource SubtleFillColorSecondaryBrush}"
491
489
IsIndeterminate=" False"
490
+ Visibility=" {x:Bind OngoingTasksViewModel.ShowProgressRing, Mode=OneWay}"
492
491
Value=" {x:Bind OngoingTasksViewModel.AverageOperationProgressValue, Mode=OneWay}" />
493
492
494
493
<InfoBadge
495
494
x:Name=" StatusInfoBadge"
496
495
HorizontalAlignment=" Center"
497
496
VerticalAlignment=" Center"
498
- Visibility=" {x:Bind OngoingTasksViewModel.HasAnyItem , Mode=OneWay}"
497
+ Visibility=" {x:Bind OngoingTasksViewModel.ShowProgressRing , Mode=OneWay}"
499
498
Value=" {x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
500
-
501
499
</Grid >
502
500
503
501
<Button .Flyout>
504
502
<Flyout
505
503
contract8Present:ShouldConstrainToRootBounds=" False"
506
504
AutomationProperties.Name=" {helpers:ResourceString Name=StatusCenter}"
505
+ Opened=" {x:Bind OngoingTasksViewModel.OnStatusCenterFlyoutOpened, Mode=OneWay}"
507
506
Placement=" BottomEdgeAlignedRight" >
508
507
<Flyout .FlyoutPresenterStyle>
509
508
<Style TargetType =" FlyoutPresenter" >
515
514
<ucs : StatusCenter
516
515
x:Name=" OngoingTasksControl"
517
516
Width=" 400"
518
- MinHeight=" 300 "
517
+ MinHeight=" 120 "
519
518
MaxHeight=" 500"
520
519
x:FieldModifier=" public"
521
520
IsTabStop=" True" />
627
626
To=" 0" />
628
627
</VisualState .StateTriggers>
629
628
<VisualState .Setters>
629
+ <Setter Target =" MedianOperationProgressRing.Background" Value =" {ThemeResource SystemFillColorSuccessBrush}" />
630
630
<Setter Target =" StatusInfoBadge.Style" Value =" {StaticResource SuccessIconInfoBadgeStyle}" />
631
631
</VisualState .Setters>
632
632
</VisualState >
638
638
To=" 1" />
639
639
</VisualState .StateTriggers>
640
640
<VisualState .Setters>
641
- <Setter Target =" StatusInfoBadge.Style" Value =" {StaticResource AttentionValueInfoBadgeStyle}" />
641
+ <Setter Target =" MedianOperationProgressRing.Foreground" Value =" {ThemeResource SystemFillColorAttentionBrush}" />
642
+ <Setter Target =" MedianOperationProgressRing.Background" Value =" {ThemeResource SubtleFillColorSecondaryBrush}" />
643
+ <Setter Target =" StatusCenterIcon.Visibility" Value =" Collapsed" />
642
644
</VisualState .Setters>
643
645
</VisualState >
644
646
<VisualState x : Name =" TasksFailure" >
649
651
To=" 2" />
650
652
</VisualState .StateTriggers>
651
653
<VisualState .Setters>
652
- <Setter Target =" StatusInfoBadge.Style" Value =" {StaticResource CriticalValueInfoBadgeStyle}" />
654
+ <Setter Target =" MedianOperationProgressRing.Foreground" Value =" {ThemeResource SystemFillColorAttentionBrush}" />
655
+ <Setter Target =" MedianOperationProgressRing.Background" Value =" {ThemeResource SubtleFillColorSecondaryBrush}" />
656
+ <Setter Target =" StatusCenterIcon.Visibility" Value =" Collapsed" />
653
657
</VisualState .Setters>
654
658
</VisualState >
655
659
<VisualState x : Name =" TasksCompletionWithFailure" >
660
664
To=" 3" />
661
665
</VisualState .StateTriggers>
662
666
<VisualState .Setters>
667
+ <Setter Target =" MedianOperationProgressRing.Background" Value =" {ThemeResource SystemFillColorCriticalBrush}" />
668
+ <Setter Target =" StatusCenterIcon.Visibility" Value =" Collapsed" />
663
669
<Setter Target =" StatusInfoBadge.Style" Value =" {StaticResource CriticalIconInfoBadgeStyle}" />
664
670
</VisualState .Setters>
665
671
</VisualState >
666
672
</VisualStateGroup >
667
673
</VisualStateManager .VisualStateGroups>
668
674
</Grid >
669
675
670
- </UserControl >
676
+ </UserControl >
0 commit comments