Skip to content

Commit 5263610

Browse files
authored
Added animated visuals (#8402)
1 parent 2df8ac2 commit 5263610

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

src/Files/UserControls/NavigationToolbar.xaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
x:Class="Files.UserControls.NavigationToolbar"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
56
xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
67
xmlns:converters="using:Files.Converters"
78
xmlns:converters1="using:Microsoft.Toolkit.Uwp.UI.Converters"
@@ -584,15 +585,23 @@
584585
x:Name="SettingsButton"
585586
Width="36"
586587
Height="32"
588+
Padding="0"
587589
AccessKey="I"
588590
AutomationProperties.AutomationId="SettingsButton"
589591
AutomationProperties.Name="{helpers:ResourceString Name=NavSettingsButton}"
590592
Background="Transparent"
593+
BorderThickness="0"
591594
Command="{x:Bind SettingsButtonCommand, Mode=OneWay}"
592-
Style="{StaticResource ToolBarButtonStyle}"
593595
ToolTipService.ToolTip="{helpers:ResourceString Name=NavSettingsButton}"
594596
Visibility="{x:Bind ShowSettingsButton, Mode=OneWay}">
595-
<FontIcon FontSize="14" Glyph="&#xE115;" />
597+
<muxc:AnimatedIcon x:Name="SettingAnimatedIcon" Height="16">
598+
<muxc:AnimatedIcon.Source>
599+
<animatedvisuals:AnimatedSettingsVisualSource />
600+
</muxc:AnimatedIcon.Source>
601+
<muxc:AnimatedIcon.FallbackIconSource>
602+
<muxc:SymbolIconSource Symbol="Setting" />
603+
</muxc:AnimatedIcon.FallbackIconSource>
604+
</muxc:AnimatedIcon>
596605
</Button>
597606
</StackPanel>
598607

src/Files/UserControls/SearchBox.xaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
x:Class="Files.UserControls.SearchBox"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
56
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
67
xmlns:fs="using:Files.Filesystem"
78
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
810
d:DesignHeight="300"
911
d:DesignWidth="400"
1012
mc:Ignorable="d">
@@ -74,7 +76,14 @@
7476
TextChanged="SearchRegion_TextChanged"
7577
UpdateTextOnSelect="False">
7678
<AutoSuggestBox.QueryIcon>
77-
<FontIcon FontSize="14" Glyph="&#xE094;" />
79+
<muxc:AnimatedIcon x:Name="SearchAnimatedIcon" Height="16">
80+
<muxc:AnimatedIcon.Source>
81+
<animatedvisuals:AnimatedFindVisualSource />
82+
</muxc:AnimatedIcon.Source>
83+
<muxc:AnimatedIcon.FallbackIconSource>
84+
<muxc:SymbolIconSource Symbol="Find" />
85+
</muxc:AnimatedIcon.FallbackIconSource>
86+
</muxc:AnimatedIcon>
7887
</AutoSuggestBox.QueryIcon>
7988
<AutoSuggestBox.KeyboardAccelerators>
8089
<KeyboardAccelerator Key="Escape" Invoked="SearchRegion_Escaped" />

0 commit comments

Comments
 (0)