From c57ce7f5fc6345e7036525f2e5740f2ec20b915b Mon Sep 17 00:00:00 2001
From: Murdo R Ergeaux <visual.melon@gmail.com>
Date: Wed, 19 Aug 2020 17:22:34 +0100
Subject: [PATCH] Fix Issue 3825

---
 src/Avalonia.Visuals/Media/GlyphRun.cs                    | 4 +---
 src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Visuals/Media/GlyphRun.cs b/src/Avalonia.Visuals/Media/GlyphRun.cs
index a32a3e1b6c..da3a1f721c 100644
--- a/src/Avalonia.Visuals/Media/GlyphRun.cs
+++ b/src/Avalonia.Visuals/Media/GlyphRun.cs
@@ -555,7 +555,7 @@ namespace Avalonia.Media
                 }
             }
 
-            return new Rect(0, 0, width, height);
+            return new Rect(0, GlyphTypeface.Ascent * Scale, width, height);
         }
 
         private void Set<T>(ref T field, T value)
@@ -595,8 +595,6 @@ namespace Avalonia.Media
             _glyphRunImpl = platformRenderInterface.CreateGlyphRun(this, out var width);
 
             var height = (GlyphTypeface.Descent - GlyphTypeface.Ascent + GlyphTypeface.LineGap) * Scale;
-
-            _bounds = new Rect(0, 0, width, height);
         }
 
         void IDisposable.Dispose()
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs
index eaf4effdbe..bdf05c4f86 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/GlyphRunNode.cs
@@ -25,7 +25,7 @@ namespace Avalonia.Rendering.SceneGraph
             GlyphRun glyphRun,
             Point baselineOrigin,
             IDictionary<IVisual, Scene> childScenes = null)
-            : base(glyphRun.Bounds, transform)
+            : base(glyphRun.Bounds.Translate(baselineOrigin), transform)
         {
             Transform = transform;
             Foreground = foreground?.ToImmutable();