Browse Source

Use Skia's font metrics

pull/4863/head
Benedikt Schroeder 6 years ago
parent
commit
374cdd1549
  1. 44
      src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs

44
src/Skia/Avalonia.Skia/GlyphTypefaceImpl.cs

@ -1,6 +1,5 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Avalonia.Media;
using Avalonia.Platform; using Avalonia.Platform;
using HarfBuzzSharp; using HarfBuzzSharp;
using SkiaSharp; using SkiaSharp;
@ -24,40 +23,31 @@ namespace Avalonia.Skia
Font.SetFunctionsOpenType(); Font.SetFunctionsOpenType();
Font.GetScale(out var xScale, out _); DesignEmHeight = (short)Typeface.UnitsPerEm;
DesignEmHeight = (short)xScale; var metrics = Typeface.ToFont().Metrics;
if (!Font.TryGetHorizontalFontExtents(out var fontExtents)) Ascent = (int)(metrics.Ascent / 12.0 * Typeface.UnitsPerEm);
{
Font.TryGetVerticalFontExtents(out fontExtents);
}
Ascent = -fontExtents.Ascender; Descent = (int)(metrics.Descent / 12.0 * Typeface.UnitsPerEm);
Descent = -fontExtents.Descender; LineGap = (int)(metrics.Leading / 12.0 * Typeface.UnitsPerEm);
LineGap = fontExtents.LineGap; UnderlinePosition = metrics.UnderlinePosition != null ?
(int)(metrics.UnderlinePosition / 12.0 * Typeface.UnitsPerEm) :
0;
if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.UnderlineOffset, out var underlinePosition)) UnderlineThickness = metrics.UnderlineThickness != null ?
{ (int)(metrics.UnderlineThickness / 12.0 * Typeface.UnitsPerEm) :
UnderlinePosition = underlinePosition; 0;
}
if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.UnderlineSize, out var underlineThickness)) StrikethroughPosition = metrics.StrikeoutPosition != null ?
{ (int)(metrics.StrikeoutPosition / 12.0 * Typeface.UnitsPerEm) :
UnderlineThickness = underlineThickness; 0;
}
if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.StrikeoutOffset, out var strikethroughPosition)) StrikethroughThickness = metrics.StrikeoutThickness != null ?
{ (int)(metrics.StrikeoutThickness / 12.0 * Typeface.UnitsPerEm) :
StrikethroughPosition = strikethroughPosition; 0;
}
if (Font.OpenTypeMetrics.TryGetPosition(OpenTypeMetricsTag.StrikeoutSize, out var strikethroughThickness))
{
StrikethroughThickness = strikethroughThickness;
}
IsFixedPitch = Typeface.IsFixedPitch; IsFixedPitch = Typeface.IsFixedPitch;
} }

Loading…
Cancel
Save