changeset 1764:43d9c4d3f5b4

RT-24920: [CheckBox, RadioButton] Layout regression
author leifs
date Tue, 18 Sep 2012 09:23:35 -0700
parents 5b2c3b1804f4
children 8400a37f8b9a
files javafx-ui-controls/src/com/sun/javafx/scene/control/skin/LabeledSkinBase.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/LabeledSkinBase.java	Mon Sep 17 16:15:26 2012 -0400
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/LabeledSkinBase.java	Tue Sep 18 09:23:35 2012 -0700
@@ -467,7 +467,7 @@
             if (w == -1) {
                 w = availableWidth;
             }
-            double minW = Math.min(getSkinnable().minWidth(-1), availableWidth);
+            double minW = Math.min(computeMinWidth(-1), availableWidth);
             if (horizontalPosition && !isIgnoreGraphic()) {
                 double graphicW = (labeled.getGraphic().getLayoutBounds().getWidth() + labeled.getGraphicTextGap());
                 w -= graphicW;
@@ -486,7 +486,7 @@
             if (h == -1) {
                 h = availableHeight;
             }
-            double minH = Math.min(getSkinnable().minHeight(w), availableHeight);
+            double minH = Math.min(computeMinHeight(w), availableHeight);
             if (verticalPosition && labeled.getGraphic() != null) {
                 double graphicH = labeled.getGraphic().getLayoutBounds().getHeight() + labeled.getGraphicTextGap();
                 h -= graphicH;