Fix InlineUIContainer clipping in text when ArrangeOverride called. (#…

…17183) (#17194) * InlineUiContainer clip fix * Removed LINQ, redo check * bugfix/InlineUiContainer-clip-in-text: redo everything * fixes by Gillibald --------- Co-authored-by: Benedikt Stebner <[email protected]>
AvaloniaUI · Oct 30, 2024 · a06ae34 · a06ae34
1 parent 397fc75
commit a06ae34
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
@@ -759,7 +759,10 @@ protected override Size ArrangeOverride(Size finalSize)
             var textLayout = TextLayout;
 
             if (HasComplexContent)
-            {             
+            {
+                //Clear visual children before complex run arrangement
+                VisualChildren.Clear();
+
                 var currentY = padding.Top;
 
                 foreach (var textLine in textLayout.TextLines)
@@ -773,6 +776,10 @@ protected override Size ArrangeOverride(Size finalSize)
                             if (drawable is EmbeddedControlRun controlRun
                                 && controlRun.Control is Control control)
                             {
+                                //Add again to prevent clipping
+                                //Fixes: #17194
+                                VisualChildren.Add(control);
+
                                 control.Arrange(
                                     new Rect(new Point(currentX, currentY),
                                     new Size(control.DesiredSize.Width, textLine.Height)));
@@ -964,6 +971,6 @@ public InlinesTextSource(IReadOnlyList<TextRun> textRuns, IReadOnlyList<ValueSpa
 
                 return new TextEndOfParagraph();
             }
-         }
+        }
     }
 }