Skip to content

Fix: Fixed search box visual states #10086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2022
Merged

Fix: Fixed search box visual states #10086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 14 additions & 21 deletions src/Files.App/UserControls/AddressToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,12 +559,11 @@
</Flyout>
</Button.Flyout>
</Button>
<!-- WINUI3 -->
<!--<InfoBadge
<InfoBadge
x:Name="StatusInfoBadge"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />-->
Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
</Grid>

<Button
Expand Down Expand Up @@ -622,72 +621,66 @@
<VisualStateManager.VisualStateGroups>
<VisualStateGroup>
<VisualState x:Name="SearchBoxAlwaysShown">
<!-- WINUI3 -->
<!--<VisualState.StateTriggers>
<VisualState.StateTriggers>
<triggers:IsEqualStateTrigger Value="{x:Bind ShowSearchBox, Mode=OneWay}" To="True" />
</VisualState.StateTriggers>-->
</VisualState.StateTriggers>
</VisualState>

<VisualState x:Name="SearchBoxCollapse">
<!-- WINUI3 -->
<!--<VisualState.StateTriggers>
<VisualState.StateTriggers>
<triggers:IsEqualStateTrigger Value="{x:Bind ShowSearchBox, Mode=OneWay}" To="False" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="SearchButton.Visibility" Value="Visible" />
<Setter Target="SearchRegion.(Grid.Column)" Value="1" />
<Setter Target="SearchRegion.Width" Value="NaN" />
</VisualState.Setters>-->
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup>
<VisualState x:Name="TasksSuccess">
<!-- WINUI3 -->
<!--<VisualState.StateTriggers>
<VisualState.StateTriggers>
<triggers:CompareStateTrigger
Comparison="Equal"
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
To="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource SuccessIconInfoBadgeStyle}" />
</VisualState.Setters>-->
</VisualState.Setters>
</VisualState>
<VisualState x:Name="TasksOnging">
<!-- WINUI3 -->
<!--<VisualState.StateTriggers>
<VisualState.StateTriggers>
<triggers:CompareStateTrigger
Comparison="Equal"
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
To="1" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource AttentionValueInfoBadgeStyle}" />
</VisualState.Setters>-->
</VisualState.Setters>
</VisualState>
<VisualState x:Name="TasksFailure">
<!-- WINUI3 -->
<!--<VisualState.StateTriggers>
<VisualState.StateTriggers>
<triggers:CompareStateTrigger
Comparison="Equal"
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
To="2" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalValueInfoBadgeStyle}" />
</VisualState.Setters>-->
</VisualState.Setters>
</VisualState>
<VisualState x:Name="TasksCompletionWithFailure">
<!-- WINUI3 -->
<!--<VisualState.StateTriggers>
<VisualState.StateTriggers>
<triggers:CompareStateTrigger
Comparison="Equal"
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
To="3" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalIconInfoBadgeStyle}" />
</VisualState.Setters>-->
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/UserControls/SidebarControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<NavigationViewItem.Icon>
<ImageIcon Source="{x:Bind Icon, Mode=OneWay}" />
</NavigationViewItem.Icon>
<!-- WINUI3 -->
<!-- WINUI3 missing some styles -->
<!--<NavigationViewItem.InfoBadge>
<InfoBadge Style="{ThemeResource CautionIconInfoBadgeStyle}" Visibility="{x:Bind IsInvalid, Mode=OneWay}" />
</NavigationViewItem.InfoBadge>-->
Expand Down