Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MacOS: Don't remove pointer after drag if released inside window #26451

Merged
merged 3 commits into from
May 30, 2021

Conversation

knopp
Copy link
Member

@knopp knopp commented May 27, 2021

Fixes flutter/flutter#83494

This PR adds NSTrackingEnabledDuringMouseDrag flag to tracking area options, which causes cocoa to signal mouseEntered: when mouse cursor enters the window during dragging. In mouseEntered: the has_pending_exit is then cleared, so flutter no longer removes the pointer if mouse is released after cursor returns to window.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on
    writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.
  • The reviewer has submitted any presubmit flakes in this PR using the engine presubmit flakes form before re-triggering the failure.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@google-cla google-cla bot added the cla: yes label May 27, 2021
@knopp knopp requested a review from stuartmorgan May 27, 2021 23:11
NSTrackingAreaOptions options =
NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved | NSTrackingInVisibleRect;
NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved |
NSTrackingInVisibleRect | NSTrackingEnabledDuringMouseDrag;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, I didn't know about this. My last deep wrestling with complex mouse tracking predated 10.5 IIRC :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. The default behavior where you get mouse exit but not enter during the same drag is just weird.

@knopp
Copy link
Member Author

knopp commented May 28, 2021

@stuartmorgan, I updated the commend and add the guard in mouseEntered:

Copy link
Contributor

@stuartmorgan stuartmorgan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@knopp knopp force-pushed the macos_dont_remove_pointer_if_inside branch from 0d40051 to 596381a Compare May 29, 2021 09:26
@knopp knopp merged commit 7579a06 into flutter:master May 30, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 31, 2021
@knopp knopp deleted the macos_dont_remove_pointer_if_inside branch July 17, 2021 09:24
naudzghebre pushed a commit to naudzghebre/engine that referenced this pull request Sep 2, 2021
…tter#26451)

* MacOS: Don't remove pointer after drag if released inside window

Fixes flutter/flutter#83494

* Update has_pending_exit documentation

* Do add mouse pointer if it wasn't removed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MacOS: Pointer is removed when releasing mouse inside window
2 participants