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

4346610: Adding JSeparator to JToolBar "pushes" buttons added after separator to edge #15054

Closed
wants to merge 10 commits into from

Conversation

prsadhuk
Copy link
Contributor

@prsadhuk prsadhuk commented Jul 27, 2023

Adding buttons in a JToolBar after a JSeparator will push the button to the far right of the frame instead of just after the separator

image

This is because BasicSeparatorUI does not define a maximum size. This leads to the separator getting all the extra width.
Fix is made to limit the separator's maximum size to the preferred size of corresponding orientation (i.e. width for VERTICAL and height for HORIZONTAL)


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-4346610: Adding JSeparator to JToolBar "pushes" buttons added after separator to edge (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15054

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 27, 2023

👋 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 Jul 27, 2023

⚠️ @prsadhuk This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk
Copy link

openjdk bot commented Jul 27, 2023

@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 Jul 27, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 27, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 27, 2023

Webrevs

@mrserb
Copy link
Member

mrserb commented Jul 27, 2023

please merge from the latest master, it may fix the GA testing.

@prsadhuk
Copy link
Contributor Author

Its not too old from latest master and I dont see any conflict being raised with the master and the commits will be quashed and right changes are being highlighted so I dont see any issue with the PR

@mrserb
Copy link
Member

mrserb commented Jul 28, 2023

Your master is from Jun 12, 2023

@prsadhuk
Copy link
Contributor Author

So? But the changed file is not being conflicted with any latest change in repo...

@mrserb
Copy link
Member

mrserb commented Jul 28, 2023

but the testing in your GA shows builds failures on 3 platforms this is not present in any other PR right now.

@prsadhuk
Copy link
Contributor Author

That can be safely ignored...As per my previous PRs, there also some tests fails but is not related to the change being done and does not hamper when integrated...

Copy link
Contributor

@TejeshR13 TejeshR13 left a comment

Choose a reason for hiding this comment

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

Fix is working as expected.

@openjdk
Copy link

openjdk bot commented Aug 7, 2023

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

4346610: Adding JSeparator to JToolBar "pushes" buttons added after separator to edge

Reviewed-by: tr, aivanov, 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 630 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 7, 2023
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.

Tested this myself and looks good.

@prsadhuk
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 16, 2023

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

  • 6a15860: 8314163: os::print_hex_dump prints incorrectly for big endian platforms and unit sizes larger than 1
  • 6bf4a33: 8314242: Update applications/scimark/Scimark.java to accept VM flags
  • bc8e9f4: 8311591: Add SystemModulesPlugin test case that splits module descriptors with new local variables defined by DedupSetBuilder
  • 0f5e030: 8309335: Get rid of use of reflection to call Thread.isVirtual() in nsk/jdi/EventRequestManager/stepRequests/stepreq001t.java
  • f66c73d: 8314166: Update googletest to v1.14.0
  • f239954: 8310134: NMT: thread count in Thread section of VM.native_memory output confusing with virtual threads
  • 2e8a0ab: 8314120: Add tests for FileDescriptor.sync
  • 80809ef: 8314248: Remove HotSpotConstantPool::isResolvedDynamicInvoke
  • 004651d: 8311557: [JVMCI] deadlock with JVMTI thread suspension
  • 9ded868: 8314114: Fix -Wconversion warnings in os code, primarily linux
  • ... and 720 more: https://git.openjdk.org/jdk/compare/4d4706967d44b6908406818bb135f94130f373a0...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 16, 2023

@prsadhuk Pushed as commit 2bd2fae.

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

@prsadhuk prsadhuk deleted the JDK-4346610 branch August 16, 2023 05:40
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
Development

Successfully merging this pull request may close these issues.

5 participants