[macOS] Fix FlutterView cursor hit testing.

flutter · Jun 3, 2024 · 2f0dd4f · 2f0dd4f
1 parent ea72558
commit 2f0dd4f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterView.mm b/shell/platform/darwin/macos/framework/Source/FlutterView.mm
@@ -107,7 +107,8 @@ - (void)didUpdateMouseCursor:(NSCursor*)cursor {
 // and will not restore it back.
 - (void)cursorUpdate:(NSEvent*)event {
   // Make sure to not override cursor when over a platform view.
-  NSView* hitTestView = [self hitTest:[self convertPoint:event.locationInWindow fromView:nil]];
+  NSPoint mouseLoc = [[self superview] convertPoint:event.locationInWindow fromView:nil];
+  NSView* hitTestView = [self hitTest:mouseLoc];
   if (hitTestView != self) {
     return;
   }

diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterViewTest.mm
@@ -110,7 +110,7 @@ - (void)set {
 
   EXPECT_TRUE(hitTestCalled);
   // The hit test coordinate should be in the window coordinate system.
-  EXPECT_TRUE(CGPointEqualToPoint(hitTestCoordinate, CGPointMake(100, 500)));
+  EXPECT_TRUE(CGPointEqualToPoint(hitTestCoordinate, CGPointMake(100, 100)));
   EXPECT_TRUE(cursor.setCalled);
 }
 
@@ -155,6 +155,6 @@ - (void)set {
 
   EXPECT_TRUE(hitTestCalled);
   // The hit test coordinate should be in the window coordinate system.
-  EXPECT_TRUE(CGPointEqualToPoint(hitTestCoordinate, CGPointMake(100, 500)));
+  EXPECT_TRUE(CGPointEqualToPoint(hitTestCoordinate, CGPointMake(100, 100)));
   EXPECT_FALSE(cursor.setCalled);
 }