Merge pull request #10357 from AvaloniaUI/fixes/adorner-idclip

Respect AdornerLayer.IsClipEnabled

src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionVisual.cs

@@ -48,7 +48,8 @@ namespace Avalonia.Rendering.Composition.Server
             {
                 canvas.PostTransform = Matrix.Identity;
                 canvas.Transform = Matrix.Identity;
-                canvas.PushClip(AdornedVisual._combinedTransformedClipBounds);
+                if (AdornerIsClipped)
+                    canvas.PushClip(AdornedVisual._combinedTransformedClipBounds);
             }
             var transform = GlobalTransformMatrix;
             canvas.PostTransform = MatrixUtils.ToMatrix(transform);
@@ -74,7 +75,7 @@ namespace Avalonia.Rendering.Composition.Server
                 canvas.PopGeometryClip();
             if (ClipToBounds && !HandlesClipToBounds)
                 canvas.PopClip();
-            if (AdornedVisual != null)
+            if (AdornedVisual != null && AdornerIsClipped)
                 canvas.PopClip();
             if(Opacity != 1)
                 canvas.PopOpacity();

src/Avalonia.Base/composition-schema.xml

@@ -26,6 +26,7 @@
         <Property Name="Scale" Type="Vector3" DefaultValue="new Vector3(1, 1, 1)" Animated="true"/>
         <Property Name="TransformMatrix" Type="Matrix4x4" DefaultValue="Matrix4x4.Identity" Animated="true"/>
         <Property Name="AdornedVisual" Type="CompositionVisual?" Internal="true" />
+        <Property Name="AdornerIsClipped" Type="bool" Internal="true" />
         <Property Name="OpacityMaskBrush" Type="Avalonia.Media.IBrush?" Internal="true" />
     </Object>
     <Object Name="CompositionContainerVisual" Inherits="CompositionVisual"/>

src/Avalonia.Controls/Primitives/AdornerLayer.cs

@@ -279,8 +279,11 @@ namespace Avalonia.Controls.Primitives
         private void UpdateAdornedElement(Visual adorner, Visual? adorned)
         {
             if (adorner.CompositionVisual != null)
+            {
                 adorner.CompositionVisual.AdornedVisual = adorned?.CompositionVisual;
-            
+                adorner.CompositionVisual.AdornerIsClipped = GetIsClipEnabled(adorner);
+            }
+
             var info = adorner.GetValue(s_adornedElementInfoProperty);
 
             if (info != null)

tests/Avalonia.RenderTests/Controls/AdornerTests.cs

@@ -1,3 +1,4 @@
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -18,56 +19,70 @@ public class AdornerTests : TestBase
     {
     }
 
-    [Fact]
-    public async Task Focus_Adorner_Is_Properly_Clipped()
+    async Task CheckAdornedContent(Control content, Control adorned, Control adorner, int width = 200, int height = 200,
+        [CallerMemberName] string testName = "")
     {
-        Border adorned;
         var tree = new Decorator
         {
             Child = new VisualLayerManager
             {
-                Child = new Border
-                {
-                    Background = Brushes.Red,
-                    Padding = new Thickness(10, 50, 10,10),
-                    Child = new Border()
-                    {
-                        Background = Brushes.White,
-                        ClipToBounds = true,
-                        Padding = new Thickness(0, -30, 0, 0),
-                        Child = adorned = new Border
-                        {
-                            Background = Brushes.Green, 
-                            VerticalAlignment = VerticalAlignment.Top,
-                            Height = 100,
-                            Width = 50
-                        }
-                    }
-                }
+                Child = content
             },
-            Width = 200,
-            Height = 200
-        };
-        var adorner = new Border
-        {
-            BorderThickness = new Thickness(2),
-            BorderBrush = Brushes.Black
+            Width = width,
+            Height = height
         };
-
+        
         var size = new Size(tree.Width, tree.Height);
         tree.Measure(size);
         tree.Arrange(new Rect(size));
-
-
+        
         adorned.AttachedToVisualTree += delegate
         {
             AdornerLayer.SetAdornedElement(adorner, adorned);
             AdornerLayer.GetAdornerLayer(adorned)!.Children.Add(adorner);
         };
+        
         tree.Measure(size);
         tree.Arrange(new Rect(size));
         
-        await RenderToFile(tree);
-        CompareImages(skipImmediate: true);
+        await RenderToFile(tree, testName: testName);
+        CompareImages(skipImmediate: true, testName: testName);
+    }
+    
+    [Theory,
+        InlineData(true),
+        InlineData(false)
+    ]
+    public async Task Focus_Adorner_Is_Properly_Clipped(bool clip)
+    {
+        Border adorned;
+        var content = new Border
+        {
+            Background = Brushes.Red,
+            Padding = new Thickness(10, 50, 10, 10),
+            Child = new Border()
+            {
+                Background = Brushes.White,
+                ClipToBounds = true,
+                Padding = new Thickness(0, -30, 0, 0),
+                Child = adorned = new Border
+                {
+                    Background = Brushes.Green,
+                    VerticalAlignment = VerticalAlignment.Top,
+                    Height = 100,
+                    Width = 50
+                }
+            }
+        };
+        var adorner = new Border
+        {
+            BorderThickness = new Thickness(2),
+            BorderBrush = Brushes.Black
+        };
+        if (!clip)
+            AdornerLayer.SetIsClipEnabled(adorner, false);
+        await CheckAdornedContent(content, adorned, adorner,
+            testName: "Focus_Adorner_Is_Properly_Clipped_Clip_" + clip);
     }
+    
 }