fix fontfallback for font with some styles like bold/italic etc.

donandren · Dec 20, 2019 · c64cc71 · c64cc71
1 parent dd864dd
commit c64cc71
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Skia/Avalonia.Skia/FontManagerImpl.cs b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
@@ -89,12 +89,15 @@ public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
 
             if (typeface.FontFamily.Key == null)
             {
+                var defaultName = SKTypeface.Default.FamilyName;
+
                 foreach (var familyName in typeface.FontFamily.FamilyNames)
                 {
                     skTypeface = SKTypeface.FromFamilyName(familyName, (SKFontStyleWeight)typeface.Weight,
                         SKFontStyleWidth.Normal, (SKFontStyleSlant)typeface.Style);
 
-                    if (skTypeface == SKTypeface.Default)
+                    if (!skTypeface.FamilyName.Equals(familyName, StringComparison.Ordinal) &&
+                        defaultName.Equals(skTypeface.FamilyName, StringComparison.Ordinal))
                     {
                         continue;
                     }