From 0da1815b2a7a35d74485bdd41faa8c5c61d20be5 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Tue, 22 Aug 2023 14:19:18 +0000
Subject: [PATCH] Merge pull request #12614 from
 Gillibald/fixes/textTrimmingWithWrap

Fix TextTrimming in combination with TextWrapping
---
 src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index a2936f1857..4432b525ea 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -1278,7 +1278,7 @@ namespace Avalonia.Media.TextFormatting
             var start = GetParagraphOffsetX(width, widthIncludingWhitespace);
             var overhangLeading = Math.Max(0, bounds.Left - start);
             var overhangTrailing = Math.Max(0, bounds.Width - widthIncludingWhitespace);
-            var hasOverflowed = overhangLeading + widthIncludingWhitespace + overhangTrailing > _paragraphWidth;
+            var hasOverflowed = width > _paragraphWidth;
 
             if (!double.IsNaN(lineHeight) && !MathUtilities.IsZero(lineHeight))
             {