From 520d9d631ada2c7dbfde8b54329050c1cfc662b7 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Fri, 17 Nov 2023 05:39:46 +0100
Subject: [PATCH] Properly handle overhang with RTL FlowDirection (#13631)

---
 .../Media/TextFormatting/TextLineImpl.cs        |   9 +++++----
 .../RestrictedHeight_VerticalAlign.expected.png | Bin 529 -> 528 bytes
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index 09042b9d60..b4534fd274 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -1299,8 +1299,6 @@ namespace Avalonia.Media.TextFormatting
                 }
             }
 
-            var overhangAfter = Math.Max(0, bounds.Bottom - height);
-
             var width = widthIncludingWhitespace;
 
             for (var i = _textRuns.Length - 1; i >= 0; i--)
@@ -1327,9 +1325,10 @@ namespace Avalonia.Media.TextFormatting
                 }
             }
 
-            var start = GetParagraphOffsetX(width, widthIncludingWhitespace);
+            //The width of overhanging pixels ath the bottom
+            var overhangAfter = Math.Max(0, bounds.Bottom - height);
             //The width of overhanging pixels at the origin
-            var overhangLeading = Math.Max(0, start - bounds.Left);
+            var overhangLeading = bounds.Left;
             //The width of overhanging pixels at the end
             var overhangTrailing = Math.Max(0, bounds.Width - widthIncludingWhitespace);
             var hasOverflowed = width > _paragraphWidth;
@@ -1339,6 +1338,8 @@ namespace Avalonia.Media.TextFormatting
                 height = lineHeight;
             }
 
+            var start = GetParagraphOffsetX(width, widthIncludingWhitespace);
+
             return new TextLineMetrics
             {
                 HasOverflowed = hasOverflowed,
diff --git a/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
index 30e2ca86621188f40d0080454681b72b4fcf83c7..c8320cdb97c182922987f97e07a33f1c68eff45e 100644
GIT binary patch
delta 486
zcmbQpGJ$1+N&Rt87srr_IdAV67R`1LVS8|YrikWTqu9QO(Kn8NEPQe4nb^KAuj%g!
z7FImbn7DPp(e4}XX9p_JV7J-pn(wH=$bb$Wthzg8ty$kxv+y0Z5!bF?5<Py&u;`Gl
zR<G=e2i~t`8^pTK|JWe(JgR-sHJ69Qx%KzBepfK~ygDi^TKD$kri$8Q)gGT_JkhiK
z?>phUczD<PS661<k>hjOlQR8@dzaltUzz;36`wzwCl~#m^Ecz?{nyX0Byb;j-TUXP
z@y@F|&nC9`N*2x+U2p!$y#Msf63>U1Ra^HbIZwL3w){~SujSnRXGQ-_Q@g)gMV~wW
zafJTQ+x2&Nbtb<*{bkbrvvWT#JhG_Oeo0<`lyzKw+ll+LU8Cp5PRiHryMCy6(tG#!
zwI%(Z!;j{kzJKsp)t{}^_dgrOuKn}!<I72hmU~Z*o_otS>-4<x6aQ9!PF(uY>%@H<
z@xLBx+osvR7gM_rbWT{io@R|juFUbjpW`>j*W25b6<U0>i&wq(cZSW}h;LugD^FJx
z_iw+sxP8ryin^)wHD7jK>kDs{j*wX$Te8~bCe)&%Yy1B1V?hsf28OW5qBdWT{t!6p
Q(GQaJboFyt=akR{02U|p%K!iX

delta 487
zcmbQhGLdD1N&N{=7srr_IdAV620eBVU^wvb71N>J6ME9`=s&RhE|a?C&!PB2kBXUk
z1|n^TGQ#C5Q*+Cw3Ps9!25<hhCdHD80Ub1~E(_jv(?adds)G0pd*&~d?pvDtgxh?g
zL7u|J{%h<Ex+3+D4zo_#!ltRa`B1uVeP8#l&k7!MmCZE%oax*Yal7}cgkZh$qw}}B
zI{#jcwb9(Ss`%fNZ+}&)d$#s>?AG|JxBp!6nI2R7_|#Qu+w}`2G~;!@n>J2L{_3!=
zD0HjU{ztVe*LqGY1@m{#@tiJV7aR0L+tB4m@$2RtO3rhpulE)CC#H7ycgK(I34fC7
zKW&{T9ieu&^hvhz{2u|?8xP4VtxrGObG2FVN%pCvwdd@V^1>xvPl{7|^nH2h{kw5B
zUboiQ_}+Hu-ye4Tul{AdnfkUM8%kELx_a`>!KknMon`g~$%l(&chx+d^;dao@zz)M
z>q{@`#_!x>RpR;ZaOPtRxq1Avx7O5bd9x-UDPigHDhcH>^?Tc^YxlaY+4($T*}=u_
zYaB`!9(fscvZvHAFX5}^<`1*PKgv|q>{{~SWl-Vj$N%*i(Sx0#;pz|mX@*<4Ha_X*
P1xb3k`njxgN@xNA@onXJ