8228363: ContextMenu.show with side=TOP does not work the first time in the presence of CSS #383

effad · 2021-01-21T06:42:19Z

By using the anchor location facility of PopupWindows we can avoid miscalculation of the
menu's height entirely.
This fix also cleans up some documentation issues.
This fix introduces tests that check the correct positioning (test_position_)
test_position_withCSS reproduces the problem that is fixed with this patch.
The other test_position_ cases serve as "proof" that no regressions are introduces.
They work before and after the fix is introduced.

Progress

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

Issue

JDK-8228363: ContextMenu.show with side=TOP does not work the first time in the presence of CSS

Reviewers

Kevin Rushforth (@kevinrushforth - Reviewer)
Ajit Ghaisas (@aghaisas - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jfx pull/383/head:pull/383
$ git checkout pull/383

By using the collection itself as synchronization lock we achieve behaviour that matches java.util.Collections classes.

…/iterating Whitespace fixes.

Pull in changes from main repo

…in the presence of CSS By using the anchor location facility of PopupWindows we can avoid miscalculation of the menu's height entirely. This fix also cleans up some documentation issues. This fix introduces tests that check the correct positioning (test_position_*) test_position_withCSS reproduces the problem that is fixed with this patch. The other test_position_* cases serve as "proof" that no regressions are introduces. They work before and after the fix is introduced.

bridgekeeper · 2021-01-21T06:43:14Z

👋 Welcome back rlichten! 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.

mlbridge · 2021-01-21T06:46:52Z

Webrevs

kevinrushforth · 2021-01-21T12:43:26Z

/reviewers 2

openjdk · 2021-01-21T12:43:43Z

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

kevinrushforth · 2021-01-21T12:47:01Z

I saw your comment in #381 regarding the removed section of API docs. We can discuss it as part of the review of this PR. I'll take a look and see whether simply removing it is fine or if I can suggest a replacement. It still might need a CSR (I'll let you know), but it would be a simple one to record the doc changes.

johanvos · 2021-01-21T13:51:21Z

This approach looks good to me, and it makes it simpler.
I agree that some info about the Side parameter would be appropriate in the JavaDoc (although it is close to trivial and the source is self-explaining)

kevinrushforth

I still need to test this, but the approach looks good. I left a few inline comments.

modules/javafx.controls/src/main/java/javafx/scene/control/ContextMenu.java

modules/javafx.controls/src/test/java/test/javafx/scene/control/ContextMenuTest.java

…in the presence of CSS Corrections as per Kevin Rushforth's comments. Also added two more test cases that test right-to-left node orientation. Fixed the implementation and the API documentation.

kevinrushforth

The fix and the tests look good to me. I have one comment on the docs (and I left a minor formatting comment).

modules/javafx.controls/src/main/java/javafx/scene/control/ContextMenu.java

…in the presence of CSS Removed node orientation from API doc. Removed extra blank lines.

modules/javafx.controls/src/test/java/test/javafx/scene/control/ContextMenuTest.java

aghaisas · 2021-01-27T11:21:19Z

modules/javafx.controls/src/main/java/javafx/scene/control/ContextMenu.java

@@ -280,6 +309,7 @@ public void show(Node anchor, double screenX, double screenY) {
        if (anchor == null) return;
        if (getItems().size() == 0) return;
        getScene().setNodeOrientation(anchor.getEffectiveNodeOrientation());
+        setAnchorLocation(AnchorLocation.CONTENT_TOP_LEFT);


Do we need to handle RTL case here?

I don't think so.
At least we didn't handle the RTL case here until now. The call to setAnchorLocation(AnchorLocation.CONTENT_TOP_LEFT); is only neccessary to "reset" the anchor location in case we called show with a Side before.

…in the presence of CSS Removed unnecessary imports.

openjdk · 2021-01-27T13:10:54Z

@effad 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:

8228363: ContextMenu.show with side=TOP does not work the first time in the presence of CSS

Reviewed-by: kcr, aghaisas

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 2 new commits pushed to the master branch:

c1b14de: 8259718: Remove the Marlin rasterizer (single-precision)
9d06bd3: 8259864: Cleanup unused Prism files

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@kevinrushforth, @aghaisas) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

effad · 2021-01-27T13:41:11Z

/integrate

openjdk · 2021-01-27T13:41:48Z

@effad
Your change (at version ba803ab) is now ready to be sponsored by a Committer.

kevinrushforth · 2021-01-27T13:46:23Z

/sponsor

openjdk · 2021-01-27T13:47:02Z

@kevinrushforth @effad Since your change was applied there have been 2 commits pushed to the master branch:

c1b14de: 8259718: Remove the Marlin rasterizer (single-precision)
9d06bd3: 8259864: Cleanup unused Prism files

Your commit was automatically rebased without conflicts.

Pushed as commit 6c1a0ca.

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

Robert Lichtenberger and others added 11 commits October 18, 2019 11:43

JDK-8232524 fixed.

8ecf354

By using the collection itself as synchronization lock we achieve behaviour that matches java.util.Collections classes.

8232524: SynchronizedObservableMap cannot be be protected for copying…

7e80839

…/iterating Whitespace fixes.

8232524: Test cleanup: terminate background thread upon failure.

7c5cf19

Merge remote-tracking branch 'upstream/master'

acfa63b

Merge remote-tracking branch 'upstream/master'

2109d5a

Merge remote-tracking branch 'upstream/master'

9ceb21b

Merge remote-tracking branch 'upstream/master'

846d048

Merge remote-tracking branch 'upstream/master'

d849c67

Merge remote-tracking branch 'upstream/master'

da2e8bc

Merge pull request #1 from openjdk/master

44a1a27

Pull in changes from main repo

openjdk bot added the rfr Ready for review label Jan 21, 2021

effad mentioned this pull request Jan 21, 2021

8228363: ContextMenu.show with side=TOP does not work the first time in the presence of CSS #381

Closed

3 tasks

kevinrushforth requested review from kevinrushforth and aghaisas January 21, 2021 12:55

abhinayagarwal mentioned this pull request Jan 21, 2021

[WIP] 8228363: Fix shifts for ContextMenu shown on TOP/LEFT side #111

Closed

3 tasks

johanvos self-requested a review January 21, 2021 14:29

kevinrushforth reviewed Jan 21, 2021

View reviewed changes

8228363: ContextMenu.show with side=TOP does not work the first time …

67a7da1

…in the presence of CSS Corrections as per Kevin Rushforth's comments. Also added two more test cases that test right-to-left node orientation. Fixed the implementation and the API documentation.

kevinrushforth reviewed Jan 22, 2021

View reviewed changes

modules/javafx.controls/src/main/java/javafx/scene/control/ContextMenu.java Outdated Show resolved Hide resolved

modules/javafx.controls/src/main/java/javafx/scene/control/ContextMenu.java Outdated Show resolved Hide resolved

8228363: ContextMenu.show with side=TOP does not work the first time …

b02dcb0

…in the presence of CSS Removed node orientation from API doc. Removed extra blank lines.

kevinrushforth approved these changes Jan 26, 2021

View reviewed changes

aghaisas reviewed Jan 27, 2021

View reviewed changes

8228363: ContextMenu.show with side=TOP does not work the first time …

ba803ab

…in the presence of CSS Removed unnecessary imports.

kevinrushforth approved these changes Jan 27, 2021

View reviewed changes

aghaisas approved these changes Jan 27, 2021

View reviewed changes

openjdk bot added the ready Ready to be integrated label Jan 27, 2021

openjdk bot added the sponsor Ready to sponsor label Jan 27, 2021

openjdk bot closed this Jan 27, 2021

openjdk bot added integrated Pull request has been integrated and removed sponsor Ready to sponsor ready Ready to be integrated rfr Ready for review labels Jan 27, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8228363: ContextMenu.show with side=TOP does not work the first time in the presence of CSS #383

8228363: ContextMenu.show with side=TOP does not work the first time in the presence of CSS #383

effad commented Jan 21, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jan 21, 2021

mlbridge bot commented Jan 21, 2021 •

edited

Loading

kevinrushforth commented Jan 21, 2021

openjdk bot commented Jan 21, 2021

kevinrushforth commented Jan 21, 2021

johanvos commented Jan 21, 2021

kevinrushforth left a comment

kevinrushforth left a comment

aghaisas Jan 27, 2021

effad Jan 27, 2021

openjdk bot commented Jan 27, 2021 •

edited

Loading

effad commented Jan 27, 2021

openjdk bot commented Jan 27, 2021

kevinrushforth commented Jan 27, 2021

openjdk bot commented Jan 27, 2021

8228363: ContextMenu.show with side=TOP does not work the first time in the presence of CSS #383

8228363: ContextMenu.show with side=TOP does not work the first time in the presence of CSS #383

Conversation

effad commented Jan 21, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Jan 21, 2021

mlbridge bot commented Jan 21, 2021 • edited Loading

Webrevs

kevinrushforth commented Jan 21, 2021

openjdk bot commented Jan 21, 2021

kevinrushforth commented Jan 21, 2021

johanvos commented Jan 21, 2021

kevinrushforth left a comment

Choose a reason for hiding this comment

kevinrushforth left a comment

Choose a reason for hiding this comment

aghaisas Jan 27, 2021

Choose a reason for hiding this comment

effad Jan 27, 2021

Choose a reason for hiding this comment

openjdk bot commented Jan 27, 2021 • edited Loading

effad commented Jan 27, 2021

openjdk bot commented Jan 27, 2021

kevinrushforth commented Jan 27, 2021

openjdk bot commented Jan 27, 2021

effad commented Jan 21, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Jan 21, 2021 •

edited

Loading

openjdk bot commented Jan 27, 2021 •

edited

Loading