Merge pull request #12614 from Gillibald/fixes/textTrimmingWithWrap

Fix TextTrimming in combination with TextWrapping
3 years ago · 0da1815b2a
1 changed files with 1 additions and 1 deletions
--- 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))
            {