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

8351047: TitledPane should handle titles that are resizable #1742

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

hjohn
Copy link
Collaborator

@hjohn hjohn commented Mar 22, 2025

This PR will forward more Label calculations to LabeledSkinBase, as they are quite complex, especially when a Graphic is involved which is a full-fledged Node. More specifically, this solves issues with TitledPane when the graphic is resizable (ie. an HBox is placed as Graphic in the titled pane's title area). Before, the calculations would only look at the preferred size of the graphic, and use these regardless of available space, even if the maximum size allowed for the graphic to be larger. After this fix, the more extensive LabeledSkinBase calculations are used.

This PR also simplifies the layout calculation. Instead of manually calculating where the label should be positioned (according to alignment), this is left to layoutLabelInArea which will do this automatically when its provided with the available space for the label instead of the label's width.

See the ticket for a sample program; take a look at the graphic-only case where an HBox is used to put a label + gap + button as the graphic of the titled pane.


Progress

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

Issue

  • JDK-8351047: TitledPane should handle titles that are resizable (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1742

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1742.diff

Using Webrev

Link to Webrev Comment

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 22, 2025

👋 Welcome back jhendrikx! 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 Mar 22, 2025

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

8351047: TitledPane should handle titles that are resizable

Reviewed-by: angorya, mstrauss

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

  • ff777c7: 8340004: [TestBug] Call ModuleLayer.Controller::enableNativeAccess directly rather than via reflection
  • 9143377: 8342565: [TestBug] StubTextLayout
  • a550e5e: 8350149: VBox ignores bias of child controls when fillWidth is set to false
  • fd099a7: 8347937: Canvas pattern test fails and crashes on WebKit 620.1

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.

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

@openjdk openjdk bot changed the title JDK-8351047 TitledPane should handle titles that are resizable 8351047: TitledPane should handle titles that are resizable Mar 22, 2025
@openjdk openjdk bot added the rfr Ready for review label Mar 22, 2025
@mlbridge
Copy link

mlbridge bot commented Mar 22, 2025

Webrevs

@hjohn
Copy link
Collaborator Author

hjohn commented Mar 22, 2025

/reviewers 2

@openjdk
Copy link

openjdk bot commented Mar 22, 2025

@hjohn
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

Copy link
Contributor

@andy-goryachev-oracle andy-goryachev-oracle left a comment

Choose a reason for hiding this comment

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

Looks good!

Also tried with titleRegion.getAlignment() code removed - still works as expected. I agree with John it looks wrong.

The problem with inability to truncate the title label by setting max/pref width might be a separate issue since it's also present in the master branch.

Copy link
Contributor

@andy-goryachev-oracle andy-goryachev-oracle left a comment

Choose a reason for hiding this comment

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

lgtm

@openjdk openjdk bot added the ready Ready to be integrated label Mar 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready Ready to be integrated rfr Ready for review
Development

Successfully merging this pull request may close these issues.

None yet

3 participants