-
Notifications
You must be signed in to change notification settings - Fork 505
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
base: master
Are you sure you want to change the base?
Conversation
👋 Welcome back jhendrikx! A progress list of the required criteria for merging this PR into |
@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:
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
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
Webrevs
|
/reviewers 2 |
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.
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.
modules/javafx.controls/src/main/java/javafx/scene/control/skin/TitledPaneSkin.java
Outdated
Show resolved
Hide resolved
modules/javafx.controls/src/main/java/javafx/scene/control/skin/TitledPaneSkin.java
Show resolved
Hide resolved
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.
lgtm
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
Issue
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