Skip to content

Commit 69eedce

Browse files
committed
When all nodes starting in a row or column are unmanaged, skip gap
1 parent 9f2f95d commit 69eedce

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

  • modules/javafx.graphics/src/main/java/javafx/scene/layout

modules/javafx.graphics/src/main/java/javafx/scene/layout/GridPane.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,7 +2400,7 @@ private CompositeSize createCompositeRows(double initSize) {
24002400
boolean[] gapBefore = new boolean[rowCount];
24012401

24022402
for (Node child : getManagedChildren()) {
2403-
gapBefore[getRowIndex(child)] = true;
2403+
gapBefore[getNodeRowIndex(child)] = true;
24042404
}
24052405

24062406
return new CompositeSize(rowCount, rowPercentHeight, rowPercentTotal,
@@ -2412,7 +2412,7 @@ private CompositeSize createCompositeColumns(double initSize) {
24122412
boolean[] gapBefore = new boolean[columnCount];
24132413

24142414
for (Node child : getManagedChildren()) {
2415-
gapBefore[getColumnIndex(child)] = true;
2415+
gapBefore[getNodeColumnIndex(child)] = true;
24162416
}
24172417

24182418
return new CompositeSize(columnCount, columnPercentWidth, columnPercentTotal,
@@ -2677,6 +2677,10 @@ private double getProportionalMinOrMaxSize(int position, boolean min) {
26772677
}
26782678

26792679
private double computeTotal(final int from, final int to) {
2680+
if (from >= singleSizes.length) {
2681+
return 0;
2682+
}
2683+
26802684
double total = singleSizes[from];
26812685

26822686
for (int i = from + 1; i < to; ++i) {

0 commit comments

Comments
 (0)