From cf6895e370c06c71aa5628eb3479b1340007fc25 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Tue, 24 Oct 2023 05:46:28 +0200
Subject: [PATCH] Fix TextLayout.OverhandLeading calculation (#13287)

* Fix overhand leading calculation

* Fix test on Mac

* Fix tests
#Conflicts:
#	tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
---
 .../Media/TextFormatting/TextLineImpl.cs      |   4 ++-
 .../Media/GlyphRunTests.cs                    |  16 ++++++++++++
 .../Media/TextFormatting/TextLineTests.cs     |  23 ++++++++++++++++++
 ...estrictedHeight_VerticalAlign.expected.png | Bin 528 -> 529 bytes
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
index c1dc7274a4..09042b9d60 100644
--- a/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
@@ -1328,7 +1328,9 @@ namespace Avalonia.Media.TextFormatting
             }
 
             var start = GetParagraphOffsetX(width, widthIncludingWhitespace);
-            var overhangLeading = Math.Max(0, bounds.Left - start);
+            //The width of overhanging pixels at the origin
+            var overhangLeading = Math.Max(0, start - bounds.Left);
+            //The width of overhanging pixels at the end
             var overhangTrailing = Math.Max(0, bounds.Width - widthIncludingWhitespace);
             var hasOverflowed = width > _paragraphWidth;
 
diff --git a/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs b/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
index 4eddfd44f6..b807e1389b 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/GlyphRunTests.cs
@@ -175,6 +175,22 @@ namespace Avalonia.Skia.UnitTests.Media
             }
         }
 
+        [Fact]
+        public void GlyphRun_With_Leading_Space_Has_Correct_InkBounds()
+        {
+            using (Start())
+            {
+                var typeface = new Typeface("resm:Avalonia.Skia.UnitTests.Assets?assembly=Avalonia.Skia.UnitTests#Inter");
+                var options = new TextShaperOptions(typeface.GlyphTypeface, 14);
+                var shapedBuffer = TextShaper.Current.ShapeText(" I", options);
+
+                var glyphRun1 = CreateGlyphRun(shapedBuffer);
+                var bounds = glyphRun1.InkBounds;
+
+                Assert.True(bounds.Left > 0);
+            }
+        }
+
         private static List<Rect> BuildRects(GlyphRun glyphRun)
         {
             var height = glyphRun.Bounds.Height;
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
index 21e283e949..7a5a1ca0c8 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextLineTests.cs
@@ -1259,6 +1259,29 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
         }
 
+       
+
+        [Fact]
+        public void Should_GetPreviousCharacterHit_Non_Trailing()
+        {
+            var text = "123.45.67.•";
+
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+                var textSource = new SingleBufferTextSource(text, defaultProperties, true);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(FlowDirection.LeftToRight, TextAlignment.Left,
+                        true, true, defaultProperties, TextWrapping.NoWrap, 0, 0, 0));
+
+                var characterHit = textLine.GetPreviousCaretCharacterHit(new CharacterHit(10, 1));
+            }
+        }
+
         private class FixedRunsTextSource : ITextSource
         {
             private readonly IReadOnlyList<TextRun> _textRuns;
diff --git a/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
index c8320cdb97c182922987f97e07a33f1c68eff45e..30e2ca86621188f40d0080454681b72b4fcf83c7 100644
GIT binary patch
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

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