Merge pull request #6657 from PJB3005/21-09-29-custom-draw-hit-test

Fix ICustomDrawOperation HitTest coordinate space.
AvaloniaUI · Sep 30, 2021 · d95f489 · d95f489
2 parents 593045c + 4888fe9
commit d95f489
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/CustomDrawOperation.cs
@@ -17,7 +17,12 @@ public CustomDrawOperation(ICustomDrawOperation custom, Matrix transform)
 
         public override bool HitTest(Point p)
         {
-            return Custom.HitTest(p * Transform);
+            if (Transform.HasInverse)
+            {
+                return Custom.HitTest(p * Transform.Invert());
+            }
+
+            return false;
         }
 
         public override void Render(IDrawingContextImpl context)