Skip to content

Commit 7bc77d6

Browse files
committed
TextIconExtension uses Segoe Fluent Icons by default
1 parent 4f394ce commit 7bc77d6

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Microsoft.Toolkit.Uwp.UI/Extensions/Markup/Abstract/TextIconExtension.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public abstract class TextIconExtension : MarkupExtension
2020
public double FontSize { get; set; }
2121

2222
[ThreadStatic]
23-
private static FontFamily segoeMDL2AssetsFontFamily;
23+
private static FontFamily symbolThemeFontFamily;
2424

2525
/// <summary>
2626
/// Gets the reusable "Segoe MDL2 Assets" <see cref="FontFamily"/> instance.
2727
/// </summary>
28-
protected static FontFamily SegoeMDL2AssetsFontFamily
28+
protected static FontFamily SymbolThemeFontFamily
2929
{
30-
get => segoeMDL2AssetsFontFamily ??= new FontFamily("Segoe MDL2 Assets");
30+
get => symbolThemeFontFamily ??= new FontFamily("Segoe Fluent Icons,Segoe MDL2 Assets");
3131
}
3232

3333
/// <summary>

Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected override object ProvideValue()
3030
var fontIcon = new FontIcon
3131
{
3232
Glyph = Glyph,
33-
FontFamily = FontFamily ?? SegoeMDL2AssetsFontFamily,
33+
FontFamily = FontFamily ?? SymbolThemeFontFamily,
3434
FontWeight = FontWeight,
3535
FontStyle = FontStyle,
3636
IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,

Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconSourceExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected override object ProvideValue()
3030
var fontIcon = new FontIconSource
3131
{
3232
Glyph = Glyph,
33-
FontFamily = FontFamily ?? SegoeMDL2AssetsFontFamily,
33+
FontFamily = FontFamily ?? SymbolThemeFontFamily,
3434
FontWeight = FontWeight,
3535
FontStyle = FontStyle,
3636
IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,

Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected override object ProvideValue()
2424
var fontIcon = new FontIcon
2525
{
2626
Glyph = unchecked((char)Symbol).ToString(),
27-
FontFamily = SegoeMDL2AssetsFontFamily,
27+
FontFamily = SymbolThemeFontFamily,
2828
FontWeight = FontWeight,
2929
FontStyle = FontStyle,
3030
IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,

Microsoft.Toolkit.Uwp.UI/Extensions/Markup/SymbolIconSourceExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected override object ProvideValue()
2424
var fontIcon = new FontIconSource
2525
{
2626
Glyph = unchecked((char)Symbol).ToString(),
27-
FontFamily = SegoeMDL2AssetsFontFamily,
27+
FontFamily = SymbolThemeFontFamily,
2828
FontWeight = FontWeight,
2929
FontStyle = FontStyle,
3030
IsTextScaleFactorEnabled = IsTextScaleFactorEnabled,

0 commit comments

Comments
 (0)