From 9eed4c974e98d840b883e3534588c09eaab333d6 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Fri, 9 Oct 2020 18:29:02 +0200
Subject: [PATCH] Make sure a GlyphRun's bounds are properly calculated

---
 src/Avalonia.Visuals/Media/GlyphRun.cs            | 15 +++++++++++++--
 .../Media/TextFormatting/TextLineImpl.cs          |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Visuals/Media/GlyphRun.cs b/src/Avalonia.Visuals/Media/GlyphRun.cs
index 155339b985..66a8c1dd0c 100644
--- a/src/Avalonia.Visuals/Media/GlyphRun.cs
+++ b/src/Avalonia.Visuals/Media/GlyphRun.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Media
         private double _fontRenderingEmSize;
         private Size? _size;
         private int _biDiLevel;
-        private Point _baselineOrigin;
+        private Point? _baselineOrigin;
 
         private ReadOnlySlice<ushort> _glyphIndices;
         private ReadOnlySlice<double> _glyphAdvances;
@@ -97,7 +97,9 @@ namespace Avalonia.Media
         {
             get
             {
-                return _baselineOrigin;
+                _baselineOrigin ??= CalculateBaselineOrigin();
+
+                return _baselineOrigin.Value;
             }
             set => Set(ref _baselineOrigin, value);
         }
@@ -538,6 +540,15 @@ namespace Avalonia.Media
             return GlyphAdvances[index];
         }
 
+        /// <summary>
+        /// Calculates the default baseline origin of the <see cref="GlyphRun"/>.
+        /// </summary>
+        /// <returns>The baseline origin.</returns>
+        private Point CalculateBaselineOrigin()
+        {
+            return new Point(0, -GlyphTypeface.Ascent * Scale);
+        }
+
         /// <summary>
         /// Calculates the size of the <see cref="GlyphRun"/>.
         /// </summary>
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
index d13b4836ea..fc98e9f6f8 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextLineImpl.cs
@@ -39,7 +39,7 @@ namespace Avalonia.Media.TextFormatting
 
             foreach (var textRun in _textRuns)
             {
-                var offsetY = LineMetrics.TextBaseline;
+                var offsetY = LineMetrics.TextBaseline - textRun.GlyphRun.BaselineOrigin.Y;
 
                 using (drawingContext.PushPostTransform(Matrix.CreateTranslation(currentX, offsetY)))
                 {