Skip to content

Commit ac1df28

Browse files
authored
Fix: Fixed search box visual states (#10086)
1 parent 4946b22 commit ac1df28

File tree

2 files changed

+15
-22
lines changed

2 files changed

+15
-22
lines changed

src/Files.App/UserControls/AddressToolbar.xaml

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -559,12 +559,11 @@
559559
</Flyout>
560560
</Button.Flyout>
561561
</Button>
562-
<!-- WINUI3 -->
563-
<!--<InfoBadge
562+
<InfoBadge
564563
x:Name="StatusInfoBadge"
565564
HorizontalAlignment="Right"
566565
VerticalAlignment="Top"
567-
Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />-->
566+
Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
568567
</Grid>
569568

570569
<Button
@@ -622,72 +621,66 @@
622621
<VisualStateManager.VisualStateGroups>
623622
<VisualStateGroup>
624623
<VisualState x:Name="SearchBoxAlwaysShown">
625-
<!-- WINUI3 -->
626-
<!--<VisualState.StateTriggers>
624+
<VisualState.StateTriggers>
627625
<triggers:IsEqualStateTrigger Value="{x:Bind ShowSearchBox, Mode=OneWay}" To="True" />
628-
</VisualState.StateTriggers>-->
626+
</VisualState.StateTriggers>
629627
</VisualState>
630628

631629
<VisualState x:Name="SearchBoxCollapse">
632-
<!-- WINUI3 -->
633-
<!--<VisualState.StateTriggers>
630+
<VisualState.StateTriggers>
634631
<triggers:IsEqualStateTrigger Value="{x:Bind ShowSearchBox, Mode=OneWay}" To="False" />
635632
</VisualState.StateTriggers>
636633
<VisualState.Setters>
637634
<Setter Target="SearchButton.Visibility" Value="Visible" />
638635
<Setter Target="SearchRegion.(Grid.Column)" Value="1" />
639636
<Setter Target="SearchRegion.Width" Value="NaN" />
640-
</VisualState.Setters>-->
637+
</VisualState.Setters>
641638
</VisualState>
642639
</VisualStateGroup>
643640
<VisualStateGroup>
644641
<VisualState x:Name="TasksSuccess">
645-
<!-- WINUI3 -->
646-
<!--<VisualState.StateTriggers>
642+
<VisualState.StateTriggers>
647643
<triggers:CompareStateTrigger
648644
Comparison="Equal"
649645
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
650646
To="0" />
651647
</VisualState.StateTriggers>
652648
<VisualState.Setters>
653649
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource SuccessIconInfoBadgeStyle}" />
654-
</VisualState.Setters>-->
650+
</VisualState.Setters>
655651
</VisualState>
656652
<VisualState x:Name="TasksOnging">
657-
<!-- WINUI3 -->
658-
<!--<VisualState.StateTriggers>
653+
<VisualState.StateTriggers>
659654
<triggers:CompareStateTrigger
660655
Comparison="Equal"
661656
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
662657
To="1" />
663658
</VisualState.StateTriggers>
664659
<VisualState.Setters>
665660
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource AttentionValueInfoBadgeStyle}" />
666-
</VisualState.Setters>-->
661+
</VisualState.Setters>
667662
</VisualState>
668663
<VisualState x:Name="TasksFailure">
669-
<!-- WINUI3 -->
670-
<!--<VisualState.StateTriggers>
664+
<VisualState.StateTriggers>
671665
<triggers:CompareStateTrigger
672666
Comparison="Equal"
673667
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
674668
To="2" />
675669
</VisualState.StateTriggers>
676670
<VisualState.Setters>
677671
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalValueInfoBadgeStyle}" />
678-
</VisualState.Setters>-->
672+
</VisualState.Setters>
679673
</VisualState>
680674
<VisualState x:Name="TasksCompletionWithFailure">
681-
<!-- WINUI3 -->
682-
<!--<VisualState.StateTriggers>
675+
<VisualState.StateTriggers>
683676
<triggers:CompareStateTrigger
684677
Comparison="Equal"
685678
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
686679
To="3" />
687680
</VisualState.StateTriggers>
688681
<VisualState.Setters>
689682
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalIconInfoBadgeStyle}" />
690-
</VisualState.Setters>-->
683+
</VisualState.Setters>
691684
</VisualState>
692685
</VisualStateGroup>
693686
</VisualStateManager.VisualStateGroups>

src/Files.App/UserControls/SidebarControl.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<NavigationViewItem.Icon>
6868
<ImageIcon Source="{x:Bind Icon, Mode=OneWay}" />
6969
</NavigationViewItem.Icon>
70-
<!-- WINUI3 -->
70+
<!-- WINUI3 missing some styles -->
7171
<!--<NavigationViewItem.InfoBadge>
7272
<InfoBadge Style="{ThemeResource CautionIconInfoBadgeStyle}" Visibility="{x:Bind IsInvalid, Mode=OneWay}" />
7373
</NavigationViewItem.InfoBadge>-->

0 commit comments

Comments
 (0)