Merge pull request #5853 from Gillibald/fixes/TextBlockHorizontalAlig…

…nment Fix TextAlignment for TextBlock when HorizontalAlignment is used. # Conflicts: # src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
AvaloniaUI · Apr 30, 2021 · cb24755 · cb24755
1 parent 60ab70a
commit cb24755
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
@@ -166,9 +166,11 @@ public void Draw(DrawingContext context)
         /// <param name="height">The current height.</param>
         private static void UpdateBounds(TextLine textLine, ref double width, ref double height)
         {
-            if (width < textLine.LineMetrics.Size.Width)
+            var lineWidth = textLine.Width + textLine.Start * 2;
+
+            if (width < lineWidth)
             {
-                width = textLine.LineMetrics.Size.Width;
+                width = lineWidth;
             }
 
             height += textLine.LineMetrics.Size.Height;