Max Katz
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
5 additions and
5 deletions
-
src/Avalonia.Base/Media/FontManager.cs
|
|
|
@ -143,11 +143,6 @@ namespace Avalonia.Media |
|
|
|
{ |
|
|
|
var source = key.Source; |
|
|
|
|
|
|
|
if (source.Scheme == SystemFontScheme) |
|
|
|
{ |
|
|
|
return SystemFonts.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface); |
|
|
|
} |
|
|
|
|
|
|
|
if (!source.IsAbsoluteUri) |
|
|
|
{ |
|
|
|
if (key.BaseUri == null) |
|
|
|
@ -158,6 +153,11 @@ namespace Avalonia.Media |
|
|
|
source = new Uri(key.BaseUri, source); |
|
|
|
} |
|
|
|
|
|
|
|
if (source.Scheme == SystemFontScheme) |
|
|
|
{ |
|
|
|
return SystemFonts.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface); |
|
|
|
} |
|
|
|
|
|
|
|
if (TryGetFontCollection(source, out var fontCollection) && |
|
|
|
fontCollection.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface)) |
|
|
|
{ |
|
|
|
|
