Skip to content

Commit 9dae693

Browse files
Youssef1313Youssef1313
committed
fix: Use SymbolThemeFontFamily instead of hard-coded Segoe MDL2 Assets
1 parent 63e9cde commit 9dae693

File tree

12 files changed

+121
-23
lines changed

12 files changed

+121
-23
lines changed

‎src/Uno.UI.FluentTheme/Resources/.editorconfig

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Overrides our root .editorconfig to match https://github.com/microsoft/microsoft-ui-xaml/blob/fd22d7ff96871f58fec5d9b284eba02fe762c60e/.editorconfig#L120-L126
2+
3+
[**.{xaml,xml}]
4+
indent_style = space
5+
indent_size = 4
6+
charset = utf-8-bom
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true
9+
end_of_line = crlf

‎src/Uno.UI.FluentTheme/Resources/Priority02/MenuFlyout_themeresources.xaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -639,21 +639,21 @@
639639
Grid.Column="0"
640640
HorizontalAlignment="Left"
641641
Margin="0">
642-
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE8C1;" />
642+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE8C1;" />
643643
</Button>
644644
<Button x:Name="LanguageSwitcherSettingsPenAndInkSettingsButton"
645645
Background="{ThemeResource MenuFlyoutItemBackground}"
646646
Grid.Column="1"
647647
HorizontalAlignment="Center"
648648
Margin="0">
649-
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE713;" />
649+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE713;" />
650650
</Button>
651651
<Button x:Name="LanguageSwitcherSettingsHelpButton"
652652
Background="{ThemeResource MenuFlyoutItemBackground}"
653653
Grid.Column="2"
654654
HorizontalAlignment="Right"
655655
Margin="0">
656-
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE9CE;" />
656+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE9CE;" />
657657
</Button>
658658
</Grid>
659659
</ControlTemplate>

‎src/Uno.UI.FluentTheme/Resources/Priority06/RevealBrush_themeresources.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2615,7 +2615,7 @@
26152615
<ColumnDefinition Width="Auto" />
26162616
</Grid.ColumnDefinitions>
26172617
<ContentPresenter x:Name="ContentPresenter" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw" />
2618-
<TextBlock x:Name="ChevronTextBlock" Grid.Column="1" FontFamily="Segoe MDL2 Assets" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" Margin="6,0,0,0" AutomationProperties.AccessibilityView="Raw" />
2618+
<TextBlock x:Name="ChevronTextBlock" Grid.Column="1" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" Margin="6,0,0,0" AutomationProperties.AccessibilityView="Raw" />
26192619
</Grid>
26202620
</Grid>
26212621
</ControlTemplate>
@@ -2844,7 +2844,7 @@
28442844
<Button x:Name="PrimaryButton" Grid.Column="0" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Command="{TemplateBinding Command}" CommandParameter="{TemplateBinding CommandParameter}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw" />
28452845
<Button x:Name="SecondaryButton" Grid.Column="2" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0,0,9,0" IsTabStop="False" AutomationProperties.AccessibilityView="Raw">
28462846
<Button.Content>
2847-
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" HorizontalAlignment="Right" AutomationProperties.AccessibilityView="Raw" />
2847+
<TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" HorizontalAlignment="Right" AutomationProperties.AccessibilityView="Raw" />
28482848
</Button.Content>
28492849
</Button>
28502850
</Grid>

‎src/Uno.UI.FluentTheme/Resources/PriorityDefault/DropDownButton.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<TextBlock
108108
x:Name="ChevronTextBlock"
109109
Grid.Column="1"
110-
FontFamily="Segoe MDL2 Assets"
110+
FontFamily="{ThemeResource SymbolThemeFontFamily}"
111111
FontSize="12"
112112
Text="&#xE70D;"
113113
VerticalAlignment="Center"

‎src/Uno.UI.FluentTheme/Resources/PriorityDefault/RatingControl.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<!-- 9794813: retire these two properties as customisation points once all resource keys available -->
1010
<Setter Property="Foreground" Value="{ThemeResource RatingControlCaptionForeground}"/>
1111
<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}"/>
12-
<Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
12+
<Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}"/>
1313
<Setter Property="ItemInfo" Value="{ThemeResource MUX_RatingControlDefaultFontInfo}"/>
1414
<!-- IsFocusEngagementEnabled means the control has to be "engaged" with
1515
using the A button before it actually receives key input from gamepad. -->

‎src/Uno.UI.FluentTheme/Resources/PriorityDefault/RatingControl_themeresources.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
FontSize="32"
5050
Text="&#xE734;"
5151
AutomationProperties.AccessibilityView="Raw"
52-
FontFamily="Segoe MDL2 Assets"/>
52+
FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
5353
</DataTemplate>
5454

5555
<DataTemplate x:Key="ForegroundGlyphDefaultTemplate">
@@ -58,7 +58,7 @@
5858
FontSize="32"
5959
Text="&#xE735;"
6060
AutomationProperties.AccessibilityView="Raw"
61-
FontFamily="Segoe MDL2 Assets"/>
61+
FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
6262
</DataTemplate>
6363

6464
<DataTemplate x:Key="BackgroundImageDefaultTemplate">

‎src/Uno.UI.FluentTheme/Resources/PriorityDefault/SplitButton.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<Button x:Name="PrimaryButton" Grid.Column="0" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="Transparent" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Command="{TemplateBinding Command}" CommandParameter="{TemplateBinding CommandParameter}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw" />
196196
<Button x:Name="SecondaryButton" Grid.Column="2" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="Transparent" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0,0,9,0" IsTabStop="False" AutomationProperties.AccessibilityView="Raw">
197197
<Button.Content>
198-
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" HorizontalAlignment="Right" IsTextScaleFactorEnabled="False" AutomationProperties.AccessibilityView="Raw" />
198+
<TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" HorizontalAlignment="Right" IsTextScaleFactorEnabled="False" AutomationProperties.AccessibilityView="Raw" />
199199
</Button.Content>
200200
</Button>
201201
</Grid>

‎src/Uno.UI.FluentTheme/themeresources.xaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -5320,13 +5320,13 @@
53205320
<RowDefinition Height="Auto" />
53215321
</Grid.RowDefinitions>
53225322
<Button x:Name="LanguageSwitcherSettingsLanguageSettingsButton" Background="{ThemeResource MenuFlyoutItemBackground}" Grid.Column="0" HorizontalAlignment="Left" Margin="0">
5323-
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE8C1;" />
5323+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE8C1;" />
53245324
</Button>
53255325
<Button x:Name="LanguageSwitcherSettingsPenAndInkSettingsButton" Background="{ThemeResource MenuFlyoutItemBackground}" Grid.Column="1" HorizontalAlignment="Center" Margin="0">
5326-
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE713;" />
5326+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE713;" />
53275327
</Button>
53285328
<Button x:Name="LanguageSwitcherSettingsHelpButton" Background="{ThemeResource MenuFlyoutItemBackground}" Grid.Column="2" HorizontalAlignment="Right" Margin="0">
5329-
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE9CE;" />
5329+
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE9CE;" />
53305330
</Button>
53315331
</Grid>
53325332
</ControlTemplate>
@@ -8493,7 +8493,7 @@
84938493
<ColumnDefinition Width="Auto" />
84948494
</Grid.ColumnDefinitions>
84958495
<ContentPresenter x:Name="ContentPresenter" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw" />
8496-
<TextBlock x:Name="ChevronTextBlock" Grid.Column="1" FontFamily="Segoe MDL2 Assets" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" Margin="6,0,0,0" AutomationProperties.AccessibilityView="Raw" />
8496+
<TextBlock x:Name="ChevronTextBlock" Grid.Column="1" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" Margin="6,0,0,0" AutomationProperties.AccessibilityView="Raw" />
84978497
</Grid>
84988498
</Grid>
84998499
</ControlTemplate>
@@ -8722,7 +8722,7 @@
87228722
<Button x:Name="PrimaryButton" Grid.Column="0" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Command="{TemplateBinding Command}" CommandParameter="{TemplateBinding CommandParameter}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw" />
87238723
<Button x:Name="SecondaryButton" Grid.Column="2" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0,0,9,0" IsTabStop="False" AutomationProperties.AccessibilityView="Raw">
87248724
<Button.Content>
8725-
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" HorizontalAlignment="Right" AutomationProperties.AccessibilityView="Raw" />
8725+
<TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" HorizontalAlignment="Right" AutomationProperties.AccessibilityView="Raw" />
87268726
</Button.Content>
87278727
</Button>
87288728
</Grid>
@@ -14896,7 +14896,7 @@
1489614896
</Grid.ColumnDefinitions>
1489714897
<!-- Uno workaround: template-bind ContentTemplateSelector because it's not automatically propagated from the ContentControl -->
1489814898
<ContentPresenter x:Name="ContentPresenter" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw" />
14899-
<TextBlock x:Name="ChevronTextBlock" Grid.Column="1" FontFamily="Segoe MDL2 Assets" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" Margin="6,0,0,0" IsTextScaleFactorEnabled="False" AutomationProperties.AccessibilityView="Raw" />
14899+
<TextBlock x:Name="ChevronTextBlock" Grid.Column="1" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" Margin="6,0,0,0" IsTextScaleFactorEnabled="False" AutomationProperties.AccessibilityView="Raw" />
1490014900
</Grid>
1490114901
</Grid>
1490214902
</ControlTemplate>
@@ -19388,7 +19388,7 @@
1938819388
<!-- 9794813: retire these two properties as customisation points once all resource keys available -->
1938919389
<Setter Property="Foreground" Value="{ThemeResource RatingControlCaptionForeground}" />
1939019390
<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
19391-
<Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
19391+
<Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
1939219392
<Setter Property="ItemInfo" Value="{ThemeResource MUX_RatingControlDefaultFontInfo}" />
1939319393
<!-- IsFocusEngagementEnabled means the control has to be "engaged" with
1939419394
using the A button before it actually receives key input from gamepad. -->
@@ -19459,11 +19459,11 @@
1945919459
</Style>
1946019460
<DataTemplate x:Key="BackgroundGlyphDefaultTemplate">
1946119461
<!-- -8, -8 are to compensate for the default scale down, plus factoring in margins -->
19462-
<TextBlock Foreground="{ThemeResource RatingControlUnselectedForeground}" Margin="-8,-8,0,0" FontSize="32" Text="&#xE734;" AutomationProperties.AccessibilityView="Raw" FontFamily="Segoe MDL2 Assets" />
19462+
<TextBlock Foreground="{ThemeResource RatingControlUnselectedForeground}" Margin="-8,-8,0,0" FontSize="32" Text="&#xE734;" AutomationProperties.AccessibilityView="Raw" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
1946319463
</DataTemplate>
1946419464
<DataTemplate x:Key="ForegroundGlyphDefaultTemplate">
1946519465
<!-- -8, -8 are to compensate for the default scale down, plus factoring in margins -->
19466-
<TextBlock Margin="-8,-8,0,0" FontSize="32" Text="&#xE735;" AutomationProperties.AccessibilityView="Raw" FontFamily="Segoe MDL2 Assets" />
19466+
<TextBlock Margin="-8,-8,0,0" FontSize="32" Text="&#xE735;" AutomationProperties.AccessibilityView="Raw" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
1946719467
</DataTemplate>
1946819468
<DataTemplate x:Key="BackgroundImageDefaultTemplate">
1946919469
<Image Margin="-8,-8,0,0" AutomationProperties.AccessibilityView="Raw" />
@@ -20521,7 +20521,7 @@
2052120521
<Button x:Name="PrimaryButton" Grid.Column="0" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="Transparent" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Command="{TemplateBinding Command}" CommandParameter="{TemplateBinding CommandParameter}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw" />
2052220522
<Button x:Name="SecondaryButton" Grid.Column="2" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="Transparent" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0,0,9,0" IsTabStop="False" AutomationProperties.AccessibilityView="Raw">
2052320523
<Button.Content>
20524-
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" HorizontalAlignment="Right" IsTextScaleFactorEnabled="False" AutomationProperties.AccessibilityView="Raw" />
20524+
<TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="12" Text="&#xE70D;" VerticalAlignment="Center" HorizontalAlignment="Right" IsTextScaleFactorEnabled="False" AutomationProperties.AccessibilityView="Raw" />
2052520525
</Button.Content>
2052620526
</Button>
2052720527
</Grid>

‎src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/SplitButton/SplitButtonTests.cs

+22
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424

2525
using SplitButton = Microsoft.UI.Xaml.Controls.SplitButton;
2626
using ToggleSplitButton = Microsoft.UI.Xaml.Controls.ToggleSplitButton;
27+
using Uno.UI.RuntimeTests.Helpers;
28+
using Windows.UI.Xaml.Media;
29+
using Private.Infrastructure;
2730

2831
namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
2932
{
@@ -82,6 +85,25 @@ public void VerifyIsCheckedProperty()
8285
Verify.IsTrue(isChecked, "ToggleSplitButton is not checked");
8386
});
8487
}
88+
89+
[TestMethod]
90+
[Description("Verifies that the TextBlock representing the Chevron glyph uses the correct font")]
91+
public void VerifyFontFamilyForChevron()
92+
{
93+
SplitButton splitButton = null;
94+
using (StyleHelper.UseFluentStyles())
95+
{
96+
RunOnUIThread.Execute(() =>
97+
{
98+
splitButton = new SplitButton();
99+
TestServices.WindowHelper.WindowContent = splitButton;
100+
101+
var secondayButton = splitButton.GetTemplateChild("SecondaryButton");
102+
var font = ((secondayButton as Button).Content as TextBlock).FontFamily;
103+
Verify.AreEqual((FontFamily)Application.Current.Resources["SymbolThemeFontFamily"], font);
104+
});
105+
}
106+
}
85107
}
86108

87109
// CanExecuteChanged is never used -- that's ok, disable the compiler warning.

‎src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/ToggleSplitButton/ToggleSplitButtonTests.cs

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
using Uno.UI.RuntimeTests.Helpers;
3+
using MUXControlsTestApp.Utilities;
4+
using Private.Infrastructure;
5+
using Windows.UI.Xaml.Controls;
6+
using Windows.UI.Xaml.Media;
7+
using Common;
8+
9+
namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
10+
{
11+
[TestClass]
12+
public class ToggleSplitButtonTests
13+
{
14+
[TestMethod]
15+
[Description("Verifies that the TextBlock representing the Chevron glyph uses the correct font")]
16+
public void VerifyFontFamilyForChevron()
17+
{
18+
Microsoft.UI.Xaml.Controls.ToggleSplitButton toggleSplitButton = null;
19+
using (StyleHelper.UseFluentStyles())
20+
{
21+
RunOnUIThread.Execute(() =>
22+
{
23+
toggleSplitButton = new Microsoft.UI.Xaml.Controls.ToggleSplitButton();
24+
TestServices.WindowHelper.WindowContent = toggleSplitButton;
25+
26+
var secondayButton = toggleSplitButton.GetTemplateChild("SecondaryButton");
27+
var font = ((secondayButton as Button).Content as TextBlock).FontFamily;
28+
Verify.AreEqual((FontFamily)Application.Current.Resources["SymbolThemeFontFamily"], font);
29+
});
30+
}
31+
}
32+
}
33+
}

0 commit comments

Comments
 (0)