Skip to content

Commit d4e12ea

Browse files
authored
[macOS] Fix FlutterView cursor hit testing (flutter#53171)
fix cursor hit testing in platform view in flutter#52159 We found that the mechanism of `[NSView hitTest: view] `will handle the flip coordinate automatically. In the previous PR, because the superview of FlutterView was not flipped, we should not convert the point using `[self convertPoint:event.locationInWindow fromView:nil]` .The FlutterView hit test should run under the window coordinate system; otherwise, FlutterMutatorView will hit a wrong point. Before the fix: Actual mouse move: `event.locationInWindow (x = 47.45703125, y = 416.86328125)` FlutterView HitTest: `(NSPoint) point = (x = 47.45703125, y = 203.13671875)` FlutterMutatorView HitTest: `(NSPoint) point = (x = 47.45703125, y = 416.86328125)` After the fix: Actual mouse move: `event.locationInWindow (x = 47.45703125, y = 416.86328125)` FlutterView HitTest: `(NSPoint) point = (x = 47.45703125, y = 416.86328125)` FlutterMutatorView HitTest: `(NSPoint) point = (x = 47.45703125, y = 203.13671875)` ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I signed the [CLA]. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat
1 parent 21b3e08 commit d4e12ea

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

shell/platform/darwin/macos/framework/Source/FlutterView.mm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ - (void)didUpdateMouseCursor:(NSCursor*)cursor {
107107
// and will not restore it back.
108108
- (void)cursorUpdate:(NSEvent*)event {
109109
// Make sure to not override cursor when over a platform view.
110-
NSView* hitTestView = [self hitTest:[self convertPoint:event.locationInWindow fromView:nil]];
110+
NSPoint mouseLocation = [[self superview] convertPoint:event.locationInWindow fromView:nil];
111+
NSView* hitTestView = [self hitTest:mouseLocation];
111112
if (hitTestView != self) {
112113
return;
113114
}

shell/platform/darwin/macos/framework/Source/FlutterViewTest.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ - (void)set {
110110

111111
EXPECT_TRUE(hitTestCalled);
112112
// The hit test coordinate should be in the window coordinate system.
113-
EXPECT_TRUE(CGPointEqualToPoint(hitTestCoordinate, CGPointMake(100, 500)));
113+
EXPECT_TRUE(CGPointEqualToPoint(hitTestCoordinate, CGPointMake(100, 100)));
114114
EXPECT_TRUE(cursor.setCalled);
115115
}
116116

@@ -155,6 +155,6 @@ - (void)set {
155155

156156
EXPECT_TRUE(hitTestCalled);
157157
// The hit test coordinate should be in the window coordinate system.
158-
EXPECT_TRUE(CGPointEqualToPoint(hitTestCoordinate, CGPointMake(100, 500)));
158+
EXPECT_TRUE(CGPointEqualToPoint(hitTestCoordinate, CGPointMake(100, 100)));
159159
EXPECT_FALSE(cursor.setCalled);
160160
}

0 commit comments

Comments
 (0)