8321970: New table columns don't appear when using fixed cell size un…

…less refreshing tableView Reviewed-by: angorya
openjdk · Dec 21, 2023 · ab68b71 · ab68b71 · openjdk-notifier · Dec 21, 2023
1 parent 8872f7a
commit ab68b71
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableRowSkinBase.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/TableRowSkinBase.java
@@ -539,7 +539,8 @@ void updateCells(boolean resetChildren) {
                 }
             }
             getChildren().removeAll(toRemove);
-        } else if (resetChildren || cellsEmpty) {
+        }
+        if (resetChildren || cellsEmpty) {
             getChildren().setAll(cells);
         }
     }

diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableRowSkinTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/TableRowSkinTest.java
@@ -26,6 +26,7 @@
 package test.javafx.scene.control.skin;
 
 import com.sun.javafx.tk.Toolkit;
+import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
@@ -316,6 +317,27 @@ public void invisibleColumnsShouldRemoveCorrespondingCellsInRow() {
         invisibleColumnsShouldRemoveCorrespondingCellsInRowImpl();
     }
 
+    /**
+     * The {@link TableRowSkin} should add new cells after new columns are added.
+     * See: JDK-8321970
+     */
+    @Test
+    public void cellsShouldBeAddedInRowFixedCellSize() {
+        tableView.setFixedCellSize(24);
+
+        TableColumn<Person, String> otherColumn = new TableColumn<>("other");
+        otherColumn.setPrefWidth(100);
+        otherColumn.setCellValueFactory(value -> new SimpleStringProperty("other"));
+        tableView.getColumns().add(otherColumn);
+
+        Toolkit.getToolkit().firePulse();
+        assertEquals(5, tableView.getColumns().size());
+
+        Toolkit.getToolkit().firePulse();
+        IndexedCell<?> row = VirtualFlowTestUtils.getCell(tableView, 1);
+        assertEquals(5, row.getChildrenUnmodifiable().stream().filter(TableCell.class::isInstance).count());
+    }
+
     @After
     public void after() {
         stageLoader.dispose();