From 9bdf58639370f0509793e9bc5291c72a898c3055 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Fri, 17 Jan 2020 16:53:23 +0100
Subject: [PATCH] Merge pull request #3357 from donandren/issues/3356

Fix ImmediateRenderer hit testing for Adorner type layers
---
 .../Notifications/WindowNotificationManager.cs      |  5 ++++-
 src/Avalonia.Controls/Primitives/AdornerLayer.cs    |  5 +----
 src/Avalonia.Controls/Primitives/OverlayLayer.cs    |  7 ++-----
 .../Rendering/ICustomSimpleHitTest.cs               | 13 +++++++++++++
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index aa91224572..9f7dd68831 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls.Primitives;
+using Avalonia.Rendering;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Notifications
@@ -14,7 +15,7 @@ namespace Avalonia.Controls.Notifications
     /// <summary>
     /// An <see cref="INotificationManager"/> that displays notifications in a <see cref="Window"/>.
     /// </summary>
-    public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager
+    public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager, ICustomSimpleHitTest
     {
         private IList _items;
 
@@ -159,5 +160,7 @@ namespace Avalonia.Controls.Notifications
                 adornerLayer.Children.Add(this);
             }
         }
+
+        public bool HitTest(Point point) => VisualChildren.HitTestCustom(point);
     }
 }
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index ebe5e0a93e..9a2f0310d7 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -138,10 +138,7 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        public bool HitTest(Point point)
-        {
-            return Children.Any(ctrl => ctrl.TransformedBounds?.Contains(point) == true);
-        }
+        public bool HitTest(Point point) => Children.HitTestCustom(point);
 
         private class AdornedElementInfo
         {
diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
index 487a5e91e4..5150033a53 100644
--- a/src/Avalonia.Controls/Primitives/OverlayLayer.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
@@ -21,11 +21,8 @@ namespace Avalonia.Controls.Primitives
 
             return null;
         }
-        
-        public bool HitTest(Point point)
-        {
-            return Children.Any(ctrl => ctrl.TransformedBounds?.Contains(point) == true);
-        }
+
+        public bool HitTest(Point point) => Children.HitTestCustom(point);
         
         protected override Size ArrangeOverride(Size finalSize)
         {
diff --git a/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs b/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
index 7199053b08..4c15de0312 100644
--- a/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
+++ b/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
@@ -1,3 +1,7 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.VisualTree;
+
 namespace Avalonia.Rendering
 {
     /// <summary>
@@ -9,4 +13,13 @@ namespace Avalonia.Rendering
     {
         bool HitTest(Point point);
     }
+
+    public static class CustomSimpleHitTestExtensions
+    {
+        public static bool HitTestCustom(this IVisual visual, Point point)
+            => (visual as ICustomSimpleHitTest)?.HitTest(point) ?? visual.TransformedBounds?.Contains(point) == true;
+
+        public static bool HitTestCustom(this IEnumerable<IVisual> children, Point point)
+            => children.Any(ctrl => ctrl.HitTestCustom(point));
+    }
 }