From 375e0f0a64e31f598c7c403bbcf83fac26854d0e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 19 Jan 2018 23:26:02 +0100
Subject: [PATCH 1/2] WIP

---
 src/Avalonia.Controls/Primitives/AdornerLayer.cs | 16 +++++++++++++++-
 src/Avalonia.Themes.Default/FocusAdorner.xaml    |  2 +-
 .../Rendering/DeferredRenderer.cs                |  9 +++++++++
 .../VisualTree/TransformedBounds.cs              |  6 +++---
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index d7862881fb..1a78493d8e 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -55,12 +55,13 @@ namespace Avalonia.Controls.Primitives
 
             foreach (var child in Children)
             {
-                var info = (AdornedElementInfo)child.GetValue(s_adornedElementInfoProperty);
+                var info = child.GetValue(s_adornedElementInfoProperty);
 
                 if (info != null && info.Bounds.HasValue)
                 {
                     child.RenderTransform = new MatrixTransform(info.Bounds.Value.Transform);
                     child.RenderTransformOrigin = new RelativePoint(new Point(0,0), RelativeUnit.Absolute);
+                    UpdateClip(child, info.Bounds.Value);
                     child.Arrange(info.Bounds.Value.Bounds);
                 }
                 else
@@ -80,6 +81,19 @@ namespace Avalonia.Controls.Primitives
             layer?.UpdateAdornedElement(adorner, adorned);
         }
 
+        private void UpdateClip(IControl control, TransformedBounds bounds)
+        {
+            var clip = control.Clip as RectangleGeometry;
+
+            if (clip == null)
+            {
+                clip = new RectangleGeometry { Transform = new MatrixTransform() };
+                control.Clip = clip;
+            }
+
+            clip.Rect = bounds.Clip.TransformToAABB(-bounds.Transform);
+        }
+
         private void ChildrenCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             switch (e.Action)
diff --git a/src/Avalonia.Themes.Default/FocusAdorner.xaml b/src/Avalonia.Themes.Default/FocusAdorner.xaml
index 573c43dc8d..3037f5763b 100644
--- a/src/Avalonia.Themes.Default/FocusAdorner.xaml
+++ b/src/Avalonia.Themes.Default/FocusAdorner.xaml
@@ -1,7 +1,7 @@
 <Style xmlns="https://github.com/avaloniaui" Selector=":is(Control)">
   <Setter Property="FocusAdorner">
     <FocusAdornerTemplate>
-      <Rectangle Stroke="Black"
+      <Rectangle Stroke="Black" Name="abcd"
                  StrokeThickness="1"
                  StrokeDashArray="1,2"/>
     </FocusAdornerTemplate>
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 041d8f8f6b..68a6aa5baf 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -243,6 +243,15 @@ namespace Avalonia.Rendering
             {
                 clipBounds = node.ClipBounds.Intersect(clipBounds);
 
+                var np = node.Visual.GetType().GetProperty("Name");
+                var name = (string)np.GetValue(node.Visual);
+
+                if (name == "abcd")
+                {
+                    var clip = (IStreamGeometryImpl)node.GeometryClip;
+                    System.Diagnostics.Debug.WriteLine(clip?.GetRenderBounds(new Pen(Brushes.Black, 1)).ToString() ?? "(null)");
+                }
+
                 if (!clipBounds.IsEmpty && node.Opacity > 0)
                 {
                     var isLayerRoot = node.Visual == layer;
diff --git a/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs b/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
index 4c548669bd..435ca85a05 100644
--- a/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
+++ b/src/Avalonia.Visuals/VisualTree/TransformedBounds.cs
@@ -24,17 +24,17 @@ namespace Avalonia.VisualTree
         }
 
         /// <summary>
-        /// Gets the control's bounds.
+        /// Gets the control's bounds in its local coordinate space.
         /// </summary>
         public Rect Bounds { get; }
 
         /// <summary>
-        /// Gets the control's clip rectangle.
+        /// Gets the control's clip rectangle in global coordinate space.
         /// </summary>
         public Rect Clip { get; }
 
         /// <summary>
-        /// Gets the control's transform.
+        /// Gets the transform from local to global coordinate space.
         /// </summary>
         public Matrix Transform { get; }
 

From eb0e6650ca6fee8479e4f833c3fac1467c8abdb3 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 27 Jan 2018 14:57:15 +0100
Subject: [PATCH 2/2] Remove debug code.

---
 src/Avalonia.Themes.Default/FocusAdorner.xaml      | 2 +-
 src/Avalonia.Visuals/Rendering/DeferredRenderer.cs | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Avalonia.Themes.Default/FocusAdorner.xaml b/src/Avalonia.Themes.Default/FocusAdorner.xaml
index 3037f5763b..573c43dc8d 100644
--- a/src/Avalonia.Themes.Default/FocusAdorner.xaml
+++ b/src/Avalonia.Themes.Default/FocusAdorner.xaml
@@ -1,7 +1,7 @@
 <Style xmlns="https://github.com/avaloniaui" Selector=":is(Control)">
   <Setter Property="FocusAdorner">
     <FocusAdornerTemplate>
-      <Rectangle Stroke="Black" Name="abcd"
+      <Rectangle Stroke="Black"
                  StrokeThickness="1"
                  StrokeDashArray="1,2"/>
     </FocusAdornerTemplate>
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
index 40b1ec3549..82cc0a260d 100644
--- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -243,15 +243,6 @@ namespace Avalonia.Rendering
             {
                 clipBounds = node.ClipBounds.Intersect(clipBounds);
 
-                var np = node.Visual.GetType().GetProperty("Name");
-                var name = (string)np.GetValue(node.Visual);
-
-                if (name == "abcd")
-                {
-                    var clip = (IStreamGeometryImpl)node.GeometryClip;
-                    System.Diagnostics.Debug.WriteLine(clip?.GetRenderBounds(new Pen(Brushes.Black, 1)).ToString() ?? "(null)");
-                }
-
                 if (!clipBounds.IsEmpty && node.Opacity > 0)
                 {
                     var isLayerRoot = node.Visual == layer;