8350149: VBox ignores bias of child controls when fillWidth is set to false

Reviewed-by: angorya, kcr

Author: hjohn

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

@@ -331,7 +331,7 @@ private double computeHeight(final boolean minimum, final double width) {
                 childWidth = computeChildWidth(child, getSnappedLeftAnchor(child), getSnappedRightAnchor(child), contentWidth, -1);
             }
             max = Math.max(max, top + (minimum && topAnchor != null && bottomAnchor != null?
-                    child.minHeight(childWidth) : computeChildPrefAreaHeight(child, -1, null, childWidth)) + bottom);
+                    child.minHeight(childWidth) : computeChildPrefAreaHeight(child, -1, null, childWidth, true)) + bottom);
         }
 
         return snappedTopInset() + max + snappedBottomInset();
@@ -348,7 +348,7 @@ private double computeChildHeight(Node child, Double topAnchor, Double bottomAnc
         if (topAnchor != null && bottomAnchor != null && child.isResizable()) {
             return areaHeight - snappedTopInset() - snappedBottomInset() - topAnchor - bottomAnchor;
         }
-        return computeChildPrefAreaHeight(child, -1, Insets.EMPTY, width);
+        return computeChildPrefAreaHeight(child, -1, Insets.EMPTY, width, true);
     }
 
     @Override protected void layoutChildren() {

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

@@ -626,8 +626,8 @@ private double getAreaWidth(Node child, double height, boolean minimum) {
     private double getAreaHeight(Node child, double width, boolean minimum) {
         if (child != null && child.isManaged()) {
             Insets margin = getNodeMargin(child);
-            return minimum ? computeChildMinAreaHeight(child, -1, margin, width):
-                                   computeChildPrefAreaHeight(child, -1, margin, width);
+            return minimum ? computeChildMinAreaHeight(child, -1, margin, width, false):
+                                   computeChildPrefAreaHeight(child, -1, margin, width, false);
         }
         return 0;
     }

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

@@ -1447,8 +1447,13 @@ private CompositeSize computePrefHeights(double[] widths) {
             Node child = managed.get(i);
             int start = getNodeRowIndex(child);
             int end = getNodeRowEndConvertRemaining(child);
-            double childPrefAreaHeight = computeChildPrefAreaHeight(child, isNodePositionedByBaseline(child) ? rowPrefBaselineComplement[start] : -1, getMargin(child),
-                    widths == null ? -1 : getTotalWidthOfNodeColumns(child, widths));
+            double childPrefAreaHeight = computeChildPrefAreaHeight(
+                child,
+                isNodePositionedByBaseline(child) ? rowPrefBaselineComplement[start] : -1,
+                getMargin(child),
+                widths == null ? -1 : getTotalWidthOfNodeColumns(child, widths),
+                false
+            );
             if (start == end && !result.isPreset(start)) {
                 double min = getRowMinHeight(start);
                 double max = getRowMaxHeight(start);
@@ -1490,8 +1495,13 @@ private CompositeSize computeMinHeights(double[] widths) {
             Node child = managed.get(i);
             int start = getNodeRowIndex(child);
             int end = getNodeRowEndConvertRemaining(child);
-            double childMinAreaHeight = computeChildMinAreaHeight(child, isNodePositionedByBaseline(child) ? rowMinBaselineComplement[start] : -1, getMargin(child),
-                             widths == null ? -1 : getTotalWidthOfNodeColumns(child, widths));
+            double childMinAreaHeight = computeChildMinAreaHeight(
+                child,
+                isNodePositionedByBaseline(child) ? rowMinBaselineComplement[start] : -1,
+                getMargin(child),
+                widths == null ? -1 : getTotalWidthOfNodeColumns(child, widths),
+                false
+            );
             if (start == end && !result.isPreset(start)) {
                 result.setMaxSize(start, childMinAreaHeight);
             } else if (start != end){
@@ -1581,17 +1591,20 @@ private CompositeSize computePrefWidths(double[] heights) {
             Node child = managed.get(i);
             int start = getNodeColumnIndex(child);
             int end = getNodeColumnEndConvertRemaining(child);
+            double childPrefAreaWidth = computeChildPrefAreaWidth(
+                child,
+                getBaselineComplementForChild(child),
+                getMargin(child),
+                heights == null ? -1 : getTotalHeightOfNodeRows(child, heights),
+                false
+            );
             if (start == end && !result.isPreset(start)) {
                 double min = getColumnMinWidth(start);
                 double max = getColumnMaxWidth(start);
-                result.setMaxSize(start, boundedSize(min < 0 ? 0 : min, computeChildPrefAreaWidth(child,
-                        getBaselineComplementForChild(child), getMargin(child),
-                        heights == null ? -1 : getTotalHeightOfNodeRows(child, heights), false),
+                result.setMaxSize(start, boundedSize(min < 0 ? 0 : min, childPrefAreaWidth,
                         max < 0 ? Double.MAX_VALUE : max));
             } else if (start != end) {
-                result.setMaxMultiSize(start, end + 1, computeChildPrefAreaWidth(child, getBaselineComplementForChild(child),
-                        getMargin(child),
-                        heights == null ? -1 : getTotalHeightOfNodeRows(child, heights), false));
+                result.setMaxMultiSize(start, end + 1, childPrefAreaWidth);
             }
         }
         return result;
@@ -1627,14 +1640,17 @@ private CompositeSize computeMinWidths(double[] heights) {
             Node child = managed.get(i);
             int start = getNodeColumnIndex(child);
             int end = getNodeColumnEndConvertRemaining(child);
+            double childMinAreaWidth = computeChildMinAreaWidth(
+                child,
+                getBaselineComplementForChild(child),
+                getMargin(child),
+                heights == null ? -1 : getTotalHeightOfNodeRows(child, heights),
+                false
+            );
             if (start == end && !result.isPreset(start)) {
-                result.setMaxSize(start, computeChildMinAreaWidth(child, getBaselineComplementForChild(child),
-                        getMargin(child),
-                        heights == null ? -1 : getTotalHeightOfNodeRows(child, heights),false));
+                result.setMaxSize(start, childMinAreaWidth);
             } else if (start != end){
-                result.setMaxMultiSize(start, end + 1, computeChildMinAreaWidth(child, getBaselineComplementForChild(child),
-                        getMargin(child),
-                        heights == null ? -1 : getTotalHeightOfNodeRows(child, heights), false));
+                result.setMaxMultiSize(start, end + 1, childMinAreaWidth);
             }
         }
         return result;

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

@@ -417,7 +417,7 @@ private boolean shouldFillHeight() {
         if (width != -1 && getContentBias() != null) {
             double prefWidths[][] = getAreaWidths(managed, -1, false);
             adjustAreaWidths(managed, prefWidths, width, -1);
-            contentHeight = computeMaxMinAreaHeight(managed, marginAccessor, prefWidths[0], getAlignmentInternal().getVpos());
+            contentHeight = computeMaxMinAreaHeight(managed, marginAccessor, prefWidths[0], false, getAlignmentInternal().getVpos());
         } else {
             contentHeight = computeMaxMinAreaHeight(managed, marginAccessor, getAlignmentInternal().getVpos());
         }
@@ -440,7 +440,7 @@ private boolean shouldFillHeight() {
         if (width != -1 && getContentBias() != null) {
             double prefWidths[][] = getAreaWidths(managed, -1, false);
             adjustAreaWidths(managed, prefWidths, width, -1);
-            contentHeight = computeMaxPrefAreaHeight(managed, marginAccessor, prefWidths[0], getAlignmentInternal().getVpos());
+            contentHeight = computeMaxPrefAreaHeight(managed, marginAccessor, prefWidths[0], false, getAlignmentInternal().getVpos());
         } else {
             contentHeight = computeMaxPrefAreaHeight(managed, marginAccessor, getAlignmentInternal().getVpos());
         }