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

Jump to bottom

8251480: TableColumnHeader: calc of cell width must respect row styling #757

Closed
wants to merge 4 commits into from
Closed

8251480: TableColumnHeader: calc of cell width must respect row styling #757

wants to merge 4 commits into from

Conversation

effad
Copy link
Collaborator

@effad effad commented Mar 16, 2022 •
edited by openjdk bot

This fix respects a row factory, if present.
It will put the cell that is used to measure the column width as child below the row.
In that way the row's style will be used.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8251480: TableColumnHeader: calc of cell width must respect row styling

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/757/head:pull/757
$ git checkout pull/757

Update a local copy of the PR:
$ git checkout pull/757
$ git pull https://git.openjdk.java.net/jfx pull/757/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 757

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/757.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 16, 2022

👋 Welcome back rlichten! 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 openjdk bot added the rfr Ready for review label Mar 16, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 16, 2022 •
edited

Webrevs

@Maran23
Copy link
Member

Maran23 commented Mar 16, 2022

Might make sense to also adjust the TreeTableView sizing implementation?

@effad
Copy link
Collaborator Author

effad commented Mar 16, 2022

Might make sense to also adjust the TreeTableView sizing implementation?

Yes I think that may be a good idea. True to the idea of specific, narrow commits I've not integrated this into this PR but would be willing to open a new issue / produce a separate PR for TreeTableView.

Maran23
Maran23 suggested changes Mar 23, 2022
View reviewed changes
Copy link
Member

@Maran23 Maran23 left a comment

Choose a reason for hiding this comment

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

The approach looks good. I left some comments and questions

modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java Outdated Show resolved Hide resolved
modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java Show resolved Hide resolved
modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java Outdated Show resolved Hide resolved
modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableColumnHeaderTest.java Outdated Show resolved Hide resolved
8251480: TableColumnHeader: calc of cell width must respect row styling
af58257 
Old behaviour restored for table rows with custom skins.
Unnecessary call to cell.applyCss() removed.
Maran23
Maran23 approved these changes Mar 29, 2022
View reviewed changes
Copy link
Member

@Maran23 Maran23 left a comment

Choose a reason for hiding this comment

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

Just commented some minor things.
But overall it looks good.
I did some manual tests as well and can confirm that this works. :)

image

modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableColumnHeaderTest.java Outdated Show resolved Hide resolved
modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java Outdated Show resolved Hide resolved
modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableColumnHeaderTest.java Outdated Show resolved Hide resolved
@kevinrushforth
Copy link
Member

In looking at the fix, I'd like two reviewers.

/reviewers 2

@openjdk
Copy link

openjdk bot commented Mar 30, 2022

@kevinrushforth
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with 1 of role reviewers, 1 of role authors).

Maran23
Maran23 approved these changes Mar 30, 2022
View reviewed changes
Copy link
Member

@Maran23 Maran23 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 to me.

aghaisas
aghaisas approved these changes Apr 5, 2022
View reviewed changes
Copy link
Collaborator

@aghaisas aghaisas 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 to me.

@openjdk
Copy link

openjdk bot commented Apr 5, 2022 •
edited

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

8251480: TableColumnHeader: calc of cell width must respect row styling

Reviewed-by: mhanl, aghaisas

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 16 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@aghaisas) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Ready to be integrated label Apr 5, 2022
@effad
Copy link
Collaborator Author

effad commented Apr 5, 2022

/integrate

@openjdk openjdk bot added the sponsor Ready to sponsor label Apr 5, 2022
@openjdk
Copy link

openjdk bot commented Apr 5, 2022

@effad
Your change (at version f463ab0) is now ready to be sponsored by a Committer.

@aghaisas
Copy link
Collaborator

aghaisas commented Apr 5, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Apr 5, 2022

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 5, 2022
@openjdk openjdk bot closed this Apr 5, 2022
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review sponsor Ready to sponsor labels Apr 5, 2022
@openjdk
Copy link

openjdk bot commented Apr 5, 2022

@aghaisas @effad Pushed as commit 18b9e94.

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

@Maran23
Copy link
Member

Maran23 commented Apr 12, 2022

@effad Do you have time and interest to take a look at this for the TreeTableView as well?
Just asking as otherwise I will have a look :)

@effad
Copy link
Collaborator Author

effad commented Apr 19, 2022 •
edited

@effad Do you have time and interest to take a look at this for the TreeTableView as well? Just asking as otherwise I will have a look :)

Sorry for late response (extended easter holidays ...). Yes I could also take a look at this for TreeTableView. Is there a pre-existing issue for this? Otherwise I'll try and come up with an example and create a new issue...

@Maran23
Copy link
Member

Maran23 commented Apr 19, 2022

Is there a pre-existing issue for this? Otherwise I'll try and come up with an example and create a new issue...

I don't think so, you may need to create a new issue. I think it's pretty much the same problem and solution as this ticket was, so you can probably copy some information.

@effad
Copy link
Collaborator Author

effad commented Apr 20, 2022

@Maran23 https://bugs.openjdk.java.net/browse/JDK-8285197 created.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kevinrushforth kevinrushforth kevinrushforth left review comments

@aghaisas aghaisas aghaisas approved these changes

@Maran23 Maran23 Maran23 approved these changes

Assignees
No one assigned
Labels
integrated Pull request has been integrated
Milestone
No milestone
4 participants
@effad @Maran23 @kevinrushforth @aghaisas