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

7189422: [macosx] Submenu's arrow have a wrong position #9769

Closed
wants to merge 2 commits into from

Conversation

prsadhuk
Copy link
Contributor

@prsadhuk prsadhuk commented Aug 5, 2022

Issue is Arrow in submenu with empty title have a wrong position in Aqua L&F as can be seen

image

which is because the text being null/empty, labelR rectangle width/height is 0 so arrowIcon y coordinate becomes -ve as per the calculation in layoutMenuItem(). Although it seems logical to me to not show the arrow if submenu text is null, but
whereas for other L&F, it is shown as this
for Metal
image

for Nimbus
image

so the fix is made in Aqua L&F to show as other L&F as
image


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-7189422: [macosx] Submenu's arrow have a wrong position

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9769/head:pull/9769
$ git checkout pull/9769

Update a local copy of the PR:
$ git checkout pull/9769
$ git pull https://git.openjdk.org/jdk pull/9769/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9769

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9769.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 5, 2022

👋 Welcome back psadhukhan! 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
Copy link

openjdk bot commented Aug 5, 2022

@prsadhuk The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Aug 5, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 5, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 5, 2022

Webrevs

@@ -494,13 +494,15 @@ private String layoutMenuItem(final JMenuItem menuItem, final FontMetrics fm, fi
if (!isTopLevelMenu) {
// if ( GetSysDirection() < 0 ) hierRect.right = hierRect.left + w + 4;
// else hierRect.left = hierRect.right - w - 4;

Choose a reason for hiding this comment

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

delete unused code


checkIconR.y = viewR.y + (labelR.height / 2) - (checkIconR.height / 2);
arrowIconR.x = Math.abs((viewR.width - arrowIconR.width) + 1);
Copy link
Contributor

Choose a reason for hiding this comment

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

May I take it that you verified this doesn't have any adverse effects on submenus with text :?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, with fix it is
Screenshot 2022-08-08 at 9 46 02 AM

whereas without fix it is
Screenshot 2022-08-08 at 9 47 57 AM

@openjdk
Copy link

openjdk bot commented Aug 11, 2022

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

7189422: [macosx] Submenu's arrow have a wrong position

Reviewed-by: prr, dnguyen

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 385 new commits pushed to 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.

➡️ 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 Pull request is ready to be integrated label Aug 11, 2022
Copy link
Contributor

@DamonGuy DamonGuy left a comment

Choose a reason for hiding this comment

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

Applied your changes and ran the test. The fix works as described.

@prsadhuk
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 29, 2022

Going to push as commit d5167a9.
Since your change was applied there have been 530 commits pushed to the master branch:

  • 512fee1: 8292972: Initialize fields if CodeBlobIterator shortcuts without heaps
  • a476ec5: 8292983: ModuleReferenceImpl.computeHash should record algorithm for cache checks
  • 99cab6a: 8292911: Add a note about jtreg failure handlers in the testing doc
  • f6b6360: 8289949: Improve test coverage for XPath: operators
  • b0e0b87: 8292917: [JVMCI] Extend InstalledCode API to make an nmethod non entrant.
  • 1500d3d: 8292994: ProblemList vmTestbase/gc/lock/jni/jnilock001/TestDescription.java
  • 4e457ac: 8291760: PipelineLeaksFD.java still fails: More or fewer pipes than expected
  • 774edeb: 8271615: vmTestbase/vm/jit/LongTransitions/ test fail due to locale mismatch
  • 9a0d1e7: 8292541: [Metrics] Reported memory limit may exceed physical machine memory
  • c74b6d4: 8292562: (fc) Use copy_file_range in FileChannel::transferTo on Linux
  • ... and 520 more: https://git.openjdk.org/jdk/compare/6e18883d8ffd9a7b7d495da05e9859dc1d1a2677...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 29, 2022
@openjdk openjdk bot closed this Aug 29, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 29, 2022
@openjdk
Copy link

openjdk bot commented Aug 29, 2022

@prsadhuk Pushed as commit d5167a9.

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

@prsadhuk prsadhuk deleted the JDK-7189422 branch August 29, 2022 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants