From cb24755a561c679105a232b85b7fe9d8cf17982b Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 30 Apr 2021 17:53:57 +0200
Subject: [PATCH] Merge pull request #5853 from
 Gillibald/fixes/TextBlockHorizontalAlignment

Fix TextAlignment for TextBlock when HorizontalAlignment is used.
# Conflicts:
#	src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
---
 src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
index daa8807bf6..cca53d671e 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextLayout.cs
@@ -166,9 +166,11 @@ namespace Avalonia.Media.TextFormatting
         /// <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;