Browse Source

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

pull/3377/head
Andrey Kunchev 6 years ago
parent
commit
c64cc71c6c
  1. 5
      src/Skia/Avalonia.Skia/FontManagerImpl.cs

5
src/Skia/Avalonia.Skia/FontManagerImpl.cs

@ -89,12 +89,15 @@ namespace Avalonia.Skia
if (typeface.FontFamily.Key == null) if (typeface.FontFamily.Key == null)
{ {
var defaultName = SKTypeface.Default.FamilyName;
foreach (var familyName in typeface.FontFamily.FamilyNames) foreach (var familyName in typeface.FontFamily.FamilyNames)
{ {
skTypeface = SKTypeface.FromFamilyName(familyName, (SKFontStyleWeight)typeface.Weight, skTypeface = SKTypeface.FromFamilyName(familyName, (SKFontStyleWeight)typeface.Weight,
SKFontStyleWidth.Normal, (SKFontStyleSlant)typeface.Style); SKFontStyleWidth.Normal, (SKFontStyleSlant)typeface.Style);
if (skTypeface == SKTypeface.Default) if (!skTypeface.FamilyName.Equals(familyName, StringComparison.Ordinal) &&
defaultName.Equals(skTypeface.FamilyName, StringComparison.Ordinal))
{ {
continue; continue;
} }

Loading…
Cancel
Save