Browse Source

Make sure only font files are compared

pull/2145/head
Benedikt Schroeder 8 years ago
parent
commit
d6c9ce3277
  1. 2
      src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs
  2. 6
      src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs

2
src/Avalonia.Visuals/Media/Fonts/FontFamilyKey.cs

@ -95,7 +95,7 @@ namespace Avalonia.Media.Fonts
{
if (!Source.IsAbsoluteUri && BaseUri != null)
{
return string.Empty + BaseUri + Source;
return BaseUri.Authority + Source;
}
return Source.ToString();

6
src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs

@ -19,8 +19,10 @@ namespace Avalonia.Media.Fonts
public static IEnumerable<Uri> LoadFontAssets(FontFamilyKey fontFamilyKey)
{
if (fontFamilyKey.Source.OriginalString.Contains(".ttf")
|| fontFamilyKey.Source.OriginalString.Contains(".otf"))
var sourceWithoutArguments = fontFamilyKey.Source.OriginalString.Split('?').First();
if (sourceWithoutArguments.EndsWith(".ttf")
|| sourceWithoutArguments.EndsWith(".otf"))
{
return GetFontAssetsByExpression(fontFamilyKey);
}

Loading…
Cancel
Save