This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
[macOS] FlutterView should not override platform view cursor #52159
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
555e158 to
0c31b8e
Compare
cbracken
approved these changes
Apr 16, 2024
Member
cbracken
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
f7a3abb to
0a0027c
Compare
0a0027c to
8d6dbd2
Compare
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Apr 17, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Apr 17, 2024
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Apr 17, 2024
…146898) flutter/engine@25b09e8...818191d 2024-04-17 [email protected] [Impeller] added static check that fragment shader and vertex shaders slots match (flutter/engine#52174) 2024-04-17 [email protected] [macOS] FlutterSurfaceManager should not return surfaces that are in use (flutter/engine#52082) 2024-04-17 [email protected] [macOS] FlutterView should not override platform view cursor (flutter/engine#52159) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
gilnobrega
pushed a commit
to gilnobrega/flutter
that referenced
this pull request
Apr 22, 2024
…lutter#146898) flutter/engine@25b09e8...818191d 2024-04-17 [email protected] [Impeller] added static check that fragment shader and vertex shaders slots match (flutter/engine#52174) 2024-04-17 [email protected] [macOS] FlutterSurfaceManager should not return surfaces that are in use (flutter/engine#52082) 2024-04-17 [email protected] [macOS] FlutterView should not override platform view cursor (flutter/engine#52159) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
8 tasks
knopp
pushed a commit
that referenced
this pull request
Jun 4, 2024
fix cursor hit testing in platform view in #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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.

This fixes an edge case that I've overlooked in #43101.
It is possible to configure
FlutterViewControllertracking area withFlutterMouseTrackingModeAlwaysoption, in which case the tracking area will call[FlutterView cursorUpdate:]unconditionally even if the mouse cursor is over platform view and the platform view has already handled the mouse update.The solution is to prevent the
FlutterViewfrom updating the cursor when the cursor is over a platform view. This can be accomplished by doing a hitTest inside[FlutterView cursorUpdate:].Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.