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

8267160: Monocle mouse never get ENTERED state #502

Closed

Conversation

johanvos
Copy link
Collaborator

@johanvos johanvos commented May 14, 2021

allow to pass a fallback window in case the existing one is null (or can't be computed).

Fix for JDK-8267160


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/502/head:pull/502
$ git checkout pull/502

Update a local copy of the PR:
$ git checkout pull/502
$ git pull https://git.openjdk.java.net/jfx pull/502/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 502

View PR using the GUI difftool:
$ git pr show -t 502

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/502.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 14, 2021

👋 Welcome back jvos! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Ready for review label May 14, 2021
@mlbridge
Copy link

mlbridge bot commented May 14, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

I'm not sure I understand the fix. Questions inline.

Comment on lines -89 to +94
MonocleWindow getWindow(boolean recalculateCache) {
if (window == null || recalculateCache) {
MonocleWindow getWindow(boolean recalculateCache, MonocleWindow fallback) {
if (recalculateCache) {
Copy link
Member

Choose a reason for hiding this comment

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

Two questions:

  1. It looks like fallback is effectively unused (always null). Did you add this for a future use case?
  2. Unless I'm missing something, the only behavioral change is that it no longer executes the if block when the window is null if recalculateCache is false.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

true to both questions.
The reason for this change is that this is now doing the same as what is done in monocle.TouchState and monocle.TouchInput.
TBH, I would prefer a different approach, where no fallback is passed, and the if block is only executed when recalculateCache is set to true. The only case where this getWindow method is invoked, is from MouseInput and it is only used to detect if the "old" window is different from the current window. Hence, it all seems a bit overkill to me, but for some reason, I thought keeping things consistent (mouseState versus TouchState) would make sense.
If you are ok with it, I can simply rewrite this without looking at the TouchState case?

Copy link
Member

Choose a reason for hiding this comment

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

Either is fine with me. As long as this fixes your problem, go ahead with the fix. Or if you prefer, go ahead and rewrite it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'll keep it like this for now, and I created a follow-up issue (JDK-8267175) for dealing with touch/mouse/key state/input handling in general in monocle.

@openjdk
Copy link

openjdk bot commented May 14, 2021

@johanvos This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8267160: Monocle mouse never get ENTERED state

Reviewed-by: kcr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Ready to be integrated label May 14, 2021
@johanvos
Copy link
Collaborator Author

/integrate

@openjdk openjdk bot closed this May 14, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels May 14, 2021
@openjdk
Copy link

openjdk bot commented May 14, 2021

@johanvos Pushed as commit 8ca7815.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
2 participants