From cd98f3f99e67511dffd37745038528dd71aaee8d Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 30 Apr 2021 19:29:45 +0100 Subject: [PATCH] Revert "Merge pull request #5853 from Gillibald/fixes/TextBlockHorizontalAlignment" This reverts commit cb24755a561c679105a232b85b7fe9d8cf17982b. --- src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs index cca53d671e..daa8807bf6 100644 --- a/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs +++ b/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs @@ -166,11 +166,9 @@ namespace Avalonia.Media.TextFormatting /// The current height. private static void UpdateBounds(TextLine textLine, ref double width, ref double height) { - var lineWidth = textLine.Width + textLine.Start * 2; - - if (width < lineWidth) + if (width < textLine.LineMetrics.Size.Width) { - width = lineWidth; + width = textLine.LineMetrics.Size.Width; } height += textLine.LineMetrics.Size.Height;