changeset 1126:477dc95c9579

ComboBox was consistently showing an IllegalStateException on startup.
author jgiles
date Thu, 24 May 2012 07:06:28 +1200
parents 3eb36e8caed4
children 4433b44f1375
files javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxBaseSkin.java
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxBaseSkin.java	Thu May 24 06:40:36 2012 +1200
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxBaseSkin.java	Thu May 24 07:06:28 2012 +1200
@@ -122,12 +122,8 @@
     }
     
     private void updateDisplayArea() {
-        if (displayNode != null) {
-            getChildren().remove(displayNode);
-            displayNode = null;
-        }
         displayNode = getDisplayNode();
-        getChildren().add(0, displayNode);
+        getChildren().setAll(displayNode, arrowButton);
     }
     
     private boolean isButton() {