Skip to content

Commit

Permalink
Merged PR 9180486: Fix icons
Browse files Browse the repository at this point in the history
  • Loading branch information
kmahone committed Jun 22, 2023
1 parent 2422301 commit e550335
Show file tree
Hide file tree
Showing 43 changed files with 93 additions and 93 deletions.
2 changes: 1 addition & 1 deletion dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@
<StackPanel.Resources>
<controls:FontIconSource x:Name="MyFontIconSource" Glyph="{Binding ElementName=boundFallback, Path=FallbackGlyph}"/>
</StackPanel.Resources>
<local:AnimatedIconHost Foreground="{StaticResource TestIconForeground}" x:Name="boundFallback" Title="AnimatedFindVisualSource" Background="DarkSlateGray" FallbackGlyph="&#xE001;">
<local:AnimatedIconHost Foreground="{StaticResource TestIconForeground}" x:Name="boundFallback" Title="AnimatedFindVisualSource" Background="DarkSlateGray" FallbackGlyph="&#xE73E;">
<local:AnimatedIconHost.IconSource>
<controls:AnimatedIconSource FallbackIconSource="{StaticResource MyFontIconSource}"/>
</local:AnimatedIconHost.IconSource>
Expand Down
2 changes: 1 addition & 1 deletion dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
HorizontalAlignment="Center"
FontStyle="Normal"
FontSize="{ThemeResource AutoSuggestBoxIconFontSize}"
Text="&#xE10A;"
Text="&#xE894;"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
AutomationProperties.AccessibilityView="Raw" />
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion dev/AutoSuggestBox/AutoSuggestBox_themeresources_v1.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
VerticalAlignment="Center"
HorizontalAlignment="Center"
FontStyle="Normal"
Text="&#xE10A;"
Text="&#xE894;"
FontSize="{ThemeResource AutoSuggestBoxIconFontSize}"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
AutomationProperties.AccessibilityView="Raw" />
Expand Down
2 changes: 1 addition & 1 deletion dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<controls:AnimatedIcon>
<animatedvisuals:AnimatedFindVisualSource/>
<controls:AnimatedIcon.FallbackIconSource>
<controls:FontIconSource Glyph="&#xE11A;" FontSize="12" FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
<controls:FontIconSource Glyph="&#xE721;" FontSize="12" FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
</controls:AnimatedIcon.FallbackIconSource>
</controls:AnimatedIcon>
</AutoSuggestBox.QueryIcon>
Expand Down
2 changes: 1 addition & 1 deletion dev/ComboBox/ComboBox_themeresources.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@
Foreground="{ThemeResource ComboBoxDropDownGlyphForeground}"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12"
Glyph="&#xE0E5;"/>
Glyph="&#xE70D;"/>
</controls:AnimatedIcon.FallbackIconSource>
</controls:AnimatedIcon>
<contract7Present:ContentPresenter x:Name="DescriptionPresenter"
Expand Down
2 changes: 1 addition & 1 deletion dev/ComboBox/ComboBox_themeresources_v1.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@
Foreground="{ThemeResource ComboBoxDropDownGlyphForeground}"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12"
Glyph="&#xE0E5;"
Glyph="&#xE70D;"
HorizontalAlignment="Right"
VerticalAlignment="Center"
AutomationProperties.AccessibilityView="Raw" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@
VerticalAlignment="Center"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="16"
Glyph="&#xE10C;" />
Glyph="&#xE712;" />
</Button>
</Grid>
<Popup x:Name="OverflowPopup">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@
VerticalAlignment="Center"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="16"
Glyph="&#xE10C;" />
Glyph="&#xE712;" />
</Button>
</Grid>
<Popup x:Name="OverflowPopup">
Expand Down
4 changes: 2 additions & 2 deletions dev/CommandBarFlyout/CommandBarFlyout_themeresources.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock x:Name="OverflowCheckGlyph"
Text="&#xE0E7;"
Text="&#xE73E;"
Foreground="{ThemeResource CommandBarFlyoutAppBarButtonForeground}"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12"
Expand Down Expand Up @@ -1302,7 +1302,7 @@
VerticalAlignment="Center"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="16"
Glyph="&#xE10C;" />
Glyph="&#xE712;" />
</Button>
</Grid>
<Popup x:Name="OverflowPopup" contract8Present:ShouldConstrainToRootBounds="False">
Expand Down
4 changes: 2 additions & 2 deletions dev/CommandBarFlyout/CommandBarFlyout_themeresources_v1.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock x:Name="OverflowCheckGlyph"
Text="&#xE0E7;"
Text="&#xE73E;"
Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="16"
Expand Down Expand Up @@ -1107,7 +1107,7 @@
VerticalAlignment="Center"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="16"
Glyph="&#xE10C;" />
Glyph="&#xE712;" />
</Button>
</Grid>
<Popup x:Name="OverflowPopup" contract8Present:ShouldConstrainToRootBounds="False">
Expand Down
2 changes: 1 addition & 1 deletion dev/CommonStyles/AppBarButton_themeresources_v1.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@
AutomationProperties.AccessibilityView="Raw" />
<FontIcon x:Name="SubItemChevron"
Grid.Column="2"
Glyph="&#xE0E3;"
Glyph="&#xE76C;"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12"
AutomationProperties.AccessibilityView="Raw"
Expand Down
4 changes: 2 additions & 2 deletions dev/CommonStyles/CalendarView_themeresources_v1.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,8 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Button x:Name="HeaderButton" Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HeaderText}" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreViews}" Style="{StaticResource NavigationButtonStyle}" Foreground="{TemplateBinding Foreground}" Padding="12,0,0,0" HorizontalContentAlignment="Left" />
<Button x:Name="PreviousButton" Grid.Column="1" Content="&#xE0E4;" FontFamily="{ThemeResource SymbolThemeFontFamily}" IsTabStop="True" Padding="1" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Center" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentBefore}" Style="{StaticResource NavigationButtonStyle}" />
<Button x:Name="NextButton" Grid.Column="2" Content="&#xE0E5;" FontFamily="{ThemeResource SymbolThemeFontFamily}" IsTabStop="True" Padding="1" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Center" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentAfter}" Style="{StaticResource NavigationButtonStyle}" />
<Button x:Name="PreviousButton" Grid.Column="1" Content="&#xE70E;" FontFamily="{ThemeResource SymbolThemeFontFamily}" IsTabStop="True" Padding="1" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Center" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentBefore}" Style="{StaticResource NavigationButtonStyle}" />
<Button x:Name="NextButton" Grid.Column="2" Content="&#xE70D;" FontFamily="{ThemeResource SymbolThemeFontFamily}" IsTabStop="True" Padding="1" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Center" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentAfter}" Style="{StaticResource NavigationButtonStyle}" />
</Grid>
<Grid x:Name="Views" Grid.Row="1">
<Grid.Clip>
Expand Down
2 changes: 1 addition & 1 deletion dev/CommonStyles/CheckBox_themeresources.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@
<x:Double x:Key="CheckBoxMinWidth">120</x:Double>
<Thickness x:Key="CheckBoxPadding">8,5,0,0</Thickness>
<Thickness x:Key="CheckBoxFocusVisualMargin">-7,-3,-7,-3</Thickness>
<x:String x:Key="CheckBoxCheckedGlyph">&#xE001;</x:String>
<x:String x:Key="CheckBoxCheckedGlyph">&#xE73E;</x:String>
<x:String x:Key="CheckBoxIndeterminateGlyph">&#xE9AE;</x:String>

<Style TargetType="CheckBox" BasedOn="{StaticResource DefaultCheckBoxStyle}" />
Expand Down
2 changes: 1 addition & 1 deletion dev/CommonStyles/CheckBox_themeresources_v1.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@
contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"/>
<FontIcon x:Name="CheckGlyph"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
Glyph="&#xE001;"
Glyph="&#xE73E;"
FontSize="16"
Foreground="{ThemeResource CheckBoxCheckGlyphForegroundUnchecked}"
Opacity="0" />
Expand Down
2 changes: 1 addition & 1 deletion dev/CommonStyles/CommandBar_themeresources.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@
VerticalAlignment="Center"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="20"
Glyph="&#xE10C;"
Glyph="&#xE712;"
Height="{ThemeResource AppBarExpandButtonCircleDiameter}" />
</Button>
<Rectangle x:Name="HighContrastBorder"
Expand Down
4 changes: 2 additions & 2 deletions dev/CommonStyles/CommandBar_themeresources_v1.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@
VerticalAlignment="Center"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="20"
Glyph="&#xE10C;"
Glyph="&#xE712;"
Height="{ThemeResource AppBarExpandButtonCircleDiameter}" />
</Button>
<Popup x:Name="OverflowPopup">
Expand Down Expand Up @@ -1679,7 +1679,7 @@
VerticalAlignment="Center"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="20"
Glyph="&#xE10C;"
Glyph="&#xE712;"
Height="{ThemeResource AppBarExpandButtonCircleDiameter}" />
</Button>
<Popup x:Name="OverflowPopup">
Expand Down
8 changes: 4 additions & 4 deletions dev/CommonStyles/FlipView_themeresources_v1.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12"
Foreground="{ThemeResource FlipViewNextPreviousArrowForeground}"
Glyph="&#xE0E3;"
Glyph="&#xE76C;"
HorizontalAlignment="Center"
VerticalAlignment="Center"
MirroredWhenRightToLeft="True"
Expand Down Expand Up @@ -202,7 +202,7 @@
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12"
Foreground="{ThemeResource FlipViewNextPreviousArrowForeground}"
Glyph="&#xE0E2;"
Glyph="&#xE76B;"
HorizontalAlignment="Center"
VerticalAlignment="Center"
MirroredWhenRightToLeft="True"
Expand Down Expand Up @@ -251,7 +251,7 @@
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12"
Foreground="{ThemeResource FlipViewNextPreviousArrowForeground}"
Glyph="&#xE0E5;"
Glyph="&#xE70D;"
HorizontalAlignment="Center"
VerticalAlignment="Center"
UseLayoutRounding="False" />
Expand Down Expand Up @@ -299,7 +299,7 @@
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="12"
Foreground="{ThemeResource FlipViewNextPreviousArrowForeground}"
Glyph="&#xE0E4;"
Glyph="&#xE70E;"
HorizontalAlignment="Center"
VerticalAlignment="Center"
UseLayoutRounding="False" />
Expand Down
Loading

0 comments on commit e550335

Please sign in to comment.