8186188: TableColumHeader: initial auto-size broken if has graphic

Reviewed-by: angorya, rlichten

Author: Maran23

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, 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
@@ -682,10 +682,8 @@ private <T,S> void resizeColumnToFitContent(TableView<T> tv, TableColumn<T, S> t
         // RT-36855 - take into account the column header text / graphic widths.
         // Magic 10 is to allow for sort arrow to appear without text truncation.
         TableColumnHeader header = tableSkin.getTableHeaderRow().getColumnHeaderFor(tc);
-        double headerTextWidth = Utils.computeTextWidth(header.label.getFont(), tc.getText(), -1);
-        Node graphic = header.label.getGraphic();
-        double headerGraphicWidth = graphic == null ? 0 : graphic.prefWidth(-1) + header.label.getGraphicTextGap();
-        double headerWidth = headerTextWidth + headerGraphicWidth + 10 + header.snappedLeftInset() + header.snappedRightInset();
+        header.applyCss();
+        double headerWidth = header.snappedLeftInset() + header.snappedRightInset() + header.label.prefWidth(-1) + 10;
         maxWidth = Math.max(maxWidth, headerWidth);
 
         // RT-23486
@@ -780,10 +778,8 @@ private <T,S> void resizeColumnToFitContent(TreeTableView<T> ttv, TreeTableColum
         // RT-36855 - take into account the column header text / graphic widths.
         // Magic 10 is to allow for sort arrow to appear without text truncation.
         TableColumnHeader header = tableSkin.getTableHeaderRow().getColumnHeaderFor(tc);
-        double headerTextWidth = Utils.computeTextWidth(header.label.getFont(), tc.getText(), -1);
-        Node graphic = header.label.getGraphic();
-        double headerGraphicWidth = graphic == null ? 0 : graphic.prefWidth(-1) + header.label.getGraphicTextGap();
-        double headerWidth = headerTextWidth + headerGraphicWidth + 10 + header.snappedLeftInset() + header.snappedRightInset();
+        header.applyCss();
+        double headerWidth = header.snappedLeftInset() + header.snappedRightInset() + header.label.prefWidth(-1) + 10;
         maxWidth = Math.max(maxWidth, headerWidth);
 
         // RT-23486

modules/javafx.controls/src/shims/java/javafx/scene/control/skin/TableColumnHeaderShim.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -24,6 +24,7 @@
  */
 package javafx.scene.control.skin;
 
+import javafx.scene.control.Label;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableColumnBase;
 
@@ -64,4 +65,8 @@ public static void columnReorderingComplete(TableColumnHeader header) {
     public static void resizeColumnToFitContent(TableColumnHeader header, int nbRows) {
         header.resizeColumnToFitContent(nbRows);
     }
+
+    public static Label getLabel(TableColumnHeader tableColumnHeader) {
+        return tableColumnHeader.label;
+    }
 }

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

@@ -30,8 +30,11 @@
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.scene.Node;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Label;
 import javafx.scene.control.Skin;
 import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumnBase;
 import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.PropertyValueFactory;
@@ -40,6 +43,7 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.HBox;
 
+import javafx.scene.text.Text;
 import org.junit.Before;
 import org.junit.After;
 import org.junit.Test;
@@ -281,6 +285,90 @@ public void test_resizeColumnToFitContentCustomRowSkin() {
         assertTrue(width > 0);
     }
 
+    /**
+     * We expect that the css of the label is processed after the resizing took place,
+     * since it is needed to correctly measure the size.
+     */
+    @Test
+    public void testResizeColumnToFitContentCssIsApplied() {
+        Label label = TableColumnHeaderShim.getLabel(firstColumnHeader);
+        label.setStyle("-fx-font-size: 24px;");
+        firstColumnHeader.getTableColumn().setText("longlonglonglong");
+
+        assertEquals(12, label.getFont().getSize(), 0);
+
+        TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
+
+        assertEquals(24, label.getFont().getSize(), 0);
+    }
+
+    /**
+     * A table column with a graphic {@link Text} should be bigger than without.
+     */
+    @Test
+    public void testResizeColumnToFitContentWithGraphicText() {
+        TableColumnBase<?, ?> tableColumn = firstColumnHeader.getTableColumn();
+
+        tableColumn.setText("longlonglonglonglonglonglonglong");
+        tableColumn.setGraphic(new Text("longlonglonglong"));
+        TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
+
+        double widthWithGraphic = tableColumn.getWidth();
+
+        tableColumn.setGraphic(null);
+        TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
+
+        double width = tableColumn.getWidth();
+
+        assertTrue(widthWithGraphic > width);
+    }
+
+    /**
+     * A table column with a graphic {@link Label} should be bigger than without.
+     */
+    @Test
+    public void testResizeColumnToFitContentWithGraphicLabel() {
+        TableColumnBase<?, ?> tableColumn = firstColumnHeader.getTableColumn();
+
+        tableColumn.setText("longlonglonglonglonglonglonglong");
+        tableColumn.setGraphic(new Label("longlonglonglong"));
+        TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
+
+        double widthWithGraphic = tableColumn.getWidth();
+
+        tableColumn.setGraphic(null);
+        TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
+
+        double width = tableColumn.getWidth();
+
+        assertTrue(widthWithGraphic > width);
+    }
+
+    /**
+     * The content display should also be taken into consideration when measuring the width.
+     * See also: <a href="https://bugs.openjdk.org/browse/JDK-8186188">JDK-8186188</a>
+     */
+    @Test
+    public void testResizeColumnToFitContentWithGraphicAlignment() {
+        TableColumnBase<?, ?> tableColumn = firstColumnHeader.getTableColumn();
+
+        tableColumn.setText("longlonglonglonglonglonglonglong");
+        tableColumn.setGraphic(new Text("longlonglonglong"));
+
+        Label label = TableColumnHeaderShim.getLabel(firstColumnHeader);
+
+        TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
+
+        double widthWithGraphic = tableColumn.getWidth();
+
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        TableColumnHeaderShim.resizeColumnToFitContent(firstColumnHeader, -1);
+
+        double width = tableColumn.getWidth();
+
+        assertTrue(widthWithGraphic > width);
+    }
+
     private TableRow<Person> createCustomRow(TableView<Person> tableView) {
         TableRow<Person> row = new TableRow<>() {
             protected Skin<?> createDefaultSkin() {