8285197: TableColumnHeader: calc of cell width must respect row styling (TreeTableView)

Reviewed-by: mhanl, aghaisas

Author: Robert Lichtenberger

modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java

@@ -737,8 +737,9 @@ private <T,S> void resizeColumnToFitContent(TreeTableView<T> ttv, TreeTableColum
             padding = r.snappedLeftInset() + r.snappedRightInset();
         }
 
-        TreeTableRow<T> treeTableRow = new TreeTableRow<>();
-        treeTableRow.updateTreeTableView(ttv);
+        Callback<TreeTableView<T>, TreeTableRow<T>> rowFactory = ttv.getRowFactory();
+        TreeTableRow<T> treeTableRow = createMeasureRow(ttv, tableSkin, rowFactory);
+        ((SkinBase<?>) treeTableRow.getSkin()).getChildren().add(cell);
 
         int rows = maxRows == -1 ? items.size() : Math.min(items.size(), maxRows);
         double maxWidth = 0;
@@ -752,8 +753,7 @@ private <T,S> void resizeColumnToFitContent(TreeTableView<T> ttv, TreeTableColum
             cell.updateIndex(row);
 
             if ((cell.getText() != null && !cell.getText().isEmpty()) || cell.getGraphic() != null) {
-                tableSkin.getChildren().add(cell);
-                cell.applyCss();
+                treeTableRow.applyCss();
 
                 double w = cell.prefWidth(-1);
 
@@ -797,6 +797,20 @@ private <T,S> void resizeColumnToFitContent(TreeTableView<T> ttv, TreeTableColum
         }
     }
 
+    private <T> TreeTableRow<T> createMeasureRow(TreeTableView<T> ttv, TableViewSkinBase tableSkin,
+            Callback<TreeTableView<T>, TreeTableRow<T>> rowFactory) {
+        TreeTableRow<T> treeTableRow = rowFactory != null ? rowFactory.call(ttv) : new TreeTableRow<>();
+        tableSkin.getChildren().add(treeTableRow);
+        treeTableRow.applyCss();
+        if (!(treeTableRow.getSkin() instanceof SkinBase<?>)) {
+            tableSkin.getChildren().remove(treeTableRow);
+            // recreate with null rowFactory will result in a standard TableRow that will
+            // have a SkinBase-derived skin
+            treeTableRow = createMeasureRow(ttv, tableSkin, null);
+        }
+        return treeTableRow;
+    }
+
     private void updateSortPosition() {
         this.sortPos = ! getTableColumn().isSortable() ? -1 : getSortPosition();
         updateSortGrid();

modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TreeTableColumnHeaderTest.java

@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.javafx.scene.control.skin;
+
+import com.sun.javafx.tk.Toolkit;
+import javafx.scene.Node;
+import javafx.scene.control.Skin;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.control.TreeTableRow;
+import javafx.scene.control.TreeTableView;
+import javafx.scene.control.cell.TreeItemPropertyValueFactory;
+import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeaderShim;
+import javafx.scene.layout.HBox;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
+import test.com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
+import test.com.sun.javafx.scene.control.test.Person;
+
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
+public class TreeTableColumnHeaderTest {
+
+    private TableColumnHeader firstColumnHeader;
+    private TreeTableView<Person> treeTableView;
+    private StageLoader sl;
+    private static String NAME0 = "Humphrey McPhee";
+    private static String NAME1 = "Justice Caldwell";
+    private static String NAME2 = "Orrin Davies";
+    private static String NAME3 = "Emma Wilson";
+
+    @Before
+    public void before() {
+        TreeItem<Person> root = new TreeItem<>(new Person("Witty quotes", "", ""));
+        root.getChildren().addAll(List.of(
+            new TreeItem<Person>(new Person(NAME0, 76)),
+            new TreeItem<Person>(new Person(NAME1, 30)),
+            new TreeItem<Person>(new Person(NAME2, 30)),
+            new TreeItem<Person>(new Person(NAME3, 8))
+        ));
+
+        TreeTableColumn<Person, String> column = new TreeTableColumn<>("Col ");
+        column.setCellValueFactory(new TreeItemPropertyValueFactory<Person, String>("firstName"));
+
+        treeTableView = new TreeTableView<>(root);
+
+        treeTableView.getColumns().add(column);
+
+        sl = new StageLoader(treeTableView);
+        Toolkit tk = Toolkit.getToolkit();
+
+        tk.firePulse();
+        //Force the column to have default font, otherwise font Amble is applied and mess with header width size
+        column.setStyle("-fx-font: System;");
+        firstColumnHeader = VirtualFlowTestUtils.getTableColumnHeader(treeTableView, column);
+    }
+
+    @After
+    public void after() {
+        sl.dispose();
+    }
+
+    /** Row style must affect the required column width */
+    @Test
+    public void test_resizeColumnToFitContentRowStyle() {
+        TreeTableColumn column = treeTableView.getColumns().get(0);
+
+        treeTableView.setRowFactory(this::createSmallRow);
+        TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
+        double width = column.getWidth();
+
+        treeTableView.setRowFactory(this::createLargeRow);
+        TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
+        assertTrue("Column width must be greater", width < column.getWidth());
+    }
+
+    /** Test resizeColumnToFitContent in the presence of a non-standard row skin */
+    @Test
+    public void test_resizeColumnToFitContentCustomRowSkin() {
+        TreeTableColumn column = treeTableView.getColumns().get(0);
+
+        treeTableView.setRowFactory(this::createCustomRow);
+        TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
+        double width = column.getWidth();
+        assertTrue(width > 0);
+    }
+
+    private TreeTableRow<Person> createCustomRow(TreeTableView<Person> treeTableView) {
+        TreeTableRow<Person> row = new TreeTableRow<>() {
+            protected Skin<?> createDefaultSkin() {
+                return new CustomSkin(this);
+            };
+        };
+        return row;
+    }
+
+    private static class CustomSkin implements Skin<TreeTableRow<?>> {
+
+        private TreeTableRow<?> row;
+        private Node node = new HBox();
+
+        CustomSkin(TreeTableRow<?> row) {
+            this.row = row;
+        }
+
+        @Override
+        public TreeTableRow<?> getSkinnable() {
+            return row;
+        }
+
+        @Override
+        public Node getNode() {
+            return node;
+        }
+
+        @Override
+        public void dispose() {
+            node = null;
+        }
+    }
+
+    private TreeTableRow<Person> createSmallRow(TreeTableView<Person> treeTableView) {
+        TreeTableRow<Person> row = new TreeTableRow<>();
+        row.setStyle("-fx-font: 24 Amble");
+        return row;
+    }
+
+    private TreeTableRow<Person> createLargeRow(TreeTableView<Person> param) {
+        TreeTableRow<Person> row = new TreeTableRow<>();
+        row.setStyle("-fx-font: 48 Amble");
+        return row;
+    }
+}