From 51437baf7301e9313f6727c4075cd0014b21bd10 Mon Sep 17 00:00:00 2001
From: Benedikt Schroeder <benedikt.schroeder@outlook.de>
Date: Tue, 13 Oct 2020 17:31:35 +0200
Subject: [PATCH] Properly scale fixed pitch fonts

---
 src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index 9c2ca053e6..6ae27870e8 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -238,11 +238,13 @@ namespace Avalonia.Direct2D1
 
             width = 0;
 
+            var scale = (float)(glyphRun.FontRenderingEmSize / glyphTypeface.DesignEmHeight);
+
             if (glyphRun.GlyphAdvances.IsEmpty)
             {
                 for (var i = 0; i < glyphCount; i++)
                 {
-                    var advance = glyphTypeface.GetGlyphAdvance(glyphRun.GlyphIndices[i]);
+                    var advance = glyphTypeface.GetGlyphAdvance(glyphRun.GlyphIndices[i]) * scale;
 
                     run.Advances[i] = advance;