Skip to content
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

chore: Point Fluent Icons to MDL2 Assets #19214

Merged
merged 2 commits into from
Jan 15, 2025
Merged

chore: Point Fluent Icons to MDL2 Assets #19214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
190fd67
chore: Point Fluent Icons to MDL2 Assets
morning4coffe-dev Jan 13, 2025
a8cb22b
chore: Reference font fallback issue
morning4coffe-dev Jan 14, 2025
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
8 changes: 7 additions & 1 deletion src/Uno.UI/UI/Xaml/FontFamily.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Uno.UI;
using Windows.Networking;

namespace Microsoft.UI.Xaml.Media
{
Expand All @@ -11,9 +12,14 @@ public partial class FontFamily
public FontFamily(string familyName)
{
Source = familyName;

Init(familyName);

// A workaround before font fallback is supported. Issue: https://github.com/unoplatform/uno/issues/10148
if (familyName.Equals("Segoe Fluent Icons,Segoe MDL2 Assets", StringComparison.OrdinalIgnoreCase))
{
Source = "Segoe MDL2 Assets";
}
MartinZikmund marked this conversation as resolved.
Show resolved Hide resolved

// This instance is immutable, we can cache the hash code.
_hashCode = familyName.GetHashCode();
}
Expand Down
Loading