From 8772a46bbaab12d3d77b76fd97eed4cffd11e365 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 29 Apr 2022 14:26:28 +0200
Subject: [PATCH] Fix scaled text measurements

---
 src/Avalonia.Controls/Presenters/TextPresenter.cs | 4 +++-
 src/Avalonia.Controls/TextBlock.cs                | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index db1bbdbc6c..c3912077ee 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -532,7 +532,9 @@ namespace Avalonia.Controls.Presenters
                 return finalSize;
             }
 
-            _constraint = new Size(finalSize.Width, Math.Ceiling(finalSize.Height));
+            var textSize = PixelSize.FromSize(finalSize, 1);
+
+            _constraint = new Size(textSize.Width, textSize.Height);
 
             _textLayout = null;
 
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index c04a62008b..7427f21134 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -626,9 +626,9 @@ namespace Avalonia.Controls
 
             var padding = Padding;
 
-            var textSize = finalSize.Deflate(padding);
+            var textSize = PixelSize.FromSize(finalSize.Deflate(padding), 1);
 
-            _constraint = new Size(textSize.Width, Math.Ceiling(textSize.Height));
+            _constraint = new Size(textSize.Width, textSize.Height);
 
             _textLayout = null;