Browse Source

Merge pull request #12614 from Gillibald/fixes/textTrimmingWithWrap

Fix TextTrimming in combination with TextWrapping
release/11.0.5-rc1
Jumar Macato 3 years ago
committed by Steven Kirk
parent
commit
0da1815b2a
  1. 2
      src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs

2
src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs

@ -1278,7 +1278,7 @@ namespace Avalonia.Media.TextFormatting
var start = GetParagraphOffsetX(width, widthIncludingWhitespace); var start = GetParagraphOffsetX(width, widthIncludingWhitespace);
var overhangLeading = Math.Max(0, bounds.Left - start); var overhangLeading = Math.Max(0, bounds.Left - start);
var overhangTrailing = Math.Max(0, bounds.Width - widthIncludingWhitespace); 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)) if (!double.IsNaN(lineHeight) && !MathUtilities.IsZero(lineHeight))
{ {

Loading…
Cancel
Save