From 0a4e5f4309cc455062d718fa72ac3b58abe9538e Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 7 Nov 2019 16:48:32 +0000 Subject: [PATCH] never return null font entry if font not resolved. --- src/Skia/Avalonia.Skia/FormattedTextImpl.cs | 2 +- src/Skia/Avalonia.Skia/SKTypefaceCollection.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs index 4ce5f3e4d2..a9358cb458 100644 --- a/src/Skia/Avalonia.Skia/FormattedTextImpl.cs +++ b/src/Skia/Avalonia.Skia/FormattedTextImpl.cs @@ -38,7 +38,7 @@ namespace Avalonia.Skia IsAntialias = true, LcdRenderText = true, SubpixelText = true, - Typeface = entry?.SKTypeface, + Typeface = entry.SKTypeface, TextSize = (float)fontSize, TextAlign = textAlignment.ToSKTextAlign() }; diff --git a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs index 8ec2a9c3f8..577567a8a1 100644 --- a/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs +++ b/src/Skia/Avalonia.Skia/SKTypefaceCollection.cs @@ -31,7 +31,7 @@ namespace Avalonia.Skia return _fontFamilies.TryGetValue(familyName, out var fontFamily) ? fontFamily.GetOrAdd(key, GetFallback(fontFamily, key)) : - null; + new TypefaceCollectionEntry(Typeface.Default, SkiaSharp.SKTypeface.Default); } private static TypefaceCollectionEntry GetFallback(IDictionary fontFamily, FontKey key)