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
Conversation
👋 Welcome back psadhukhan! A progress list of the required criteria for merging this PR into |
@@ -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; |
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.
delete unused code
|
||
checkIconR.y = viewR.y + (labelR.height / 2) - (checkIconR.height / 2); | ||
arrowIconR.x = Math.abs((viewR.width - arrowIconR.width) + 1); |
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.
May I take it that you verified this doesn't have any adverse effects on submenus with text :?
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.
@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:
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
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 |
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.
Applied your changes and ran the test. The fix works as described.
/integrate |
Going to push as commit d5167a9.
Your commit was automatically rebased without conflicts. |
Issue is Arrow in submenu with empty title have a wrong position in Aqua L&F as can be seen
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, butwhereas for other L&F, it is shown as this
for Metal
for Nimbus
so the fix is made in Aqua L&F to show as other L&F as
Progress
Issue
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