Browse Source

Merge

pull/20304/head
Benedikt Stebner 2 days ago
parent
commit
912db0e8f4
  1. 1
      src/Avalonia.Base/Media/Fonts/Tables/Cmap/CharacterToGlyphMap.cs
  2. 7
      src/Avalonia.Base/Media/GlyphTypeface.cs

1
src/Avalonia.Base/Media/Fonts/Tables/Cmap/CharacterToGlyphMap.cs

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
namespace Avalonia.Media.Fonts.Tables.Cmap

7
src/Avalonia.Base/Media/GlyphTypeface.cs

@ -95,6 +95,8 @@ namespace Avalonia.Media
// Load COLR and CPAL tables for color glyph support
ColrTable.TryLoad(this, out _colrTable);
CpalTable.TryLoad(this, out _cpalTable);
IsLastResort = ((headTable.Flags & HeadFlags.LastResortFont) != 0) || _cmapTable.Format == CmapFormat.Format13;
}
var ascent = 0;
@ -132,11 +134,6 @@ namespace Avalonia.Media
}
}
HeadTable.TryLoad(this, out var headTable);
IsLastResort = (headTable is not null && (headTable.Flags & HeadFlags.LastResortFont) != 0) ||
_cmapTable.Format == CmapFormat.Format13;
var postTable = PostTable.Load(this);
var isFixedPitch = postTable.IsFixedPitch;

Loading…
Cancel
Save