Skip to content

Commit 836a492

Browse files
authored
Fixed an issue where the status center badge was always visible (#7970)
1 parent 254376d commit 836a492

File tree

1 file changed

+47
-46
lines changed

1 file changed

+47
-46
lines changed

src/Files/UserControls/NavigationToolbar.xaml

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -514,52 +514,53 @@
514514
</Button.KeyboardAccelerators>
515515
</Button>
516516

517-
<Button
518-
x:Name="OngoingTasks"
519-
Width="36"
520-
Height="32"
521-
Padding="0"
522-
AccessKey="T"
523-
AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
524-
Background="Transparent"
525-
Style="{StaticResource ToolBarButtonStyle}"
526-
ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}"
527-
Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
528-
<Button.Content>
529-
<Grid>
530-
<FontIcon
531-
x:Name="OngoingTasksFontIcon"
532-
FontSize="16"
533-
Glyph="&#xF16A;" />
534-
<muxc:ProgressRing
535-
x:Name="MedianOperationProgressRing"
536-
Width="28"
537-
Height="28"
538-
HorizontalAlignment="Center"
539-
VerticalAlignment="Center"
540-
x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
541-
IsIndeterminate="False"
542-
Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
543-
</Grid>
544-
</Button.Content>
545-
<Button.Flyout>
546-
<Flyout contract8Present:ShouldConstrainToRootBounds="False" AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}">
547-
<uc:OngoingTasksFlyout
548-
x:Name="OngoingTasksControl"
549-
Width="300"
550-
MinHeight="300"
551-
MaxHeight="400"
552-
x:FieldModifier="public"
553-
IsTabStop="True"
554-
OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}" />
555-
</Flyout>
556-
</Button.Flyout>
557-
</Button>
558-
<muxc:InfoBadge
559-
x:Name="StatusInfoBadge"
560-
HorizontalAlignment="Right"
561-
VerticalAlignment="Top"
562-
Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
517+
<Grid Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
518+
<Button
519+
x:Name="OngoingTasks"
520+
Width="36"
521+
Height="32"
522+
Padding="0"
523+
AccessKey="T"
524+
AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
525+
Background="Transparent"
526+
Style="{StaticResource ToolBarButtonStyle}"
527+
ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}">
528+
<Button.Content>
529+
<Grid>
530+
<FontIcon
531+
x:Name="OngoingTasksFontIcon"
532+
FontSize="16"
533+
Glyph="&#xF16A;" />
534+
<muxc:ProgressRing
535+
x:Name="MedianOperationProgressRing"
536+
Width="28"
537+
Height="28"
538+
HorizontalAlignment="Center"
539+
VerticalAlignment="Center"
540+
x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
541+
IsIndeterminate="False"
542+
Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
543+
</Grid>
544+
</Button.Content>
545+
<Button.Flyout>
546+
<Flyout contract8Present:ShouldConstrainToRootBounds="False" AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}">
547+
<uc:OngoingTasksFlyout
548+
x:Name="OngoingTasksControl"
549+
Width="300"
550+
MinHeight="300"
551+
MaxHeight="400"
552+
x:FieldModifier="public"
553+
IsTabStop="True"
554+
OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}" />
555+
</Flyout>
556+
</Button.Flyout>
557+
</Button>
558+
<muxc:InfoBadge
559+
x:Name="StatusInfoBadge"
560+
HorizontalAlignment="Right"
561+
VerticalAlignment="Top"
562+
Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
563+
</Grid>
563564

564565
<Button
565566
x:Name="SettingsButton"

0 commit comments

Comments
 (0)