changeset 1135:dc5dd86e13ab

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/2.2/scrum/controls/jfx/rt
author jgiles
date Thu, 24 May 2012 10:47:39 +1200
parents cb74862c833d c7a141a73c4c
children c555ea353dcf 1e32f8fd3b5d
files
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxBaseSkin.java	Wed May 23 15:11:47 2012 -0700
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxBaseSkin.java	Thu May 24 10:47:39 2012 +1200
@@ -155,7 +155,7 @@
         
         if (isButton()) return;
         
-        arrowButton.resize(arrowButtonWidth, getHeight());
+        arrowButton.resize(arrowButtonWidth, getHeight() - padding.getTop() - padding.getBottom());
         positionInArea(arrowButton, getWidth() - padding.getRight() - arrowButtonWidth, 0, 
                 arrowButtonWidth, getHeight(), 0, HPos.CENTER, VPos.CENTER);
     }
--- a/javafx-ui-controls/src/javafx/scene/control/ComboBox.java	Wed May 23 15:11:47 2012 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/ComboBox.java	Thu May 24 10:47:39 2012 +1200
@@ -410,13 +410,15 @@
     }
     
     private void updateBindings() {
+        if (textField == null) return;
+        
         // remove bindings if any exist
         textField.promptTextProperty().unbindBidirectional(promptTextProperty());
-        textField.textProperty().unbindBidirectional(valueProperty());
+//        textField.textProperty().unbindBidirectional(valueProperty());
         
         // update bindings with new converter
         textField.promptTextProperty().bindBidirectional(promptTextProperty());
-        textField.textProperty().bindBidirectional(valueProperty(), getConverter());
+//        textField.textProperty().bindBidirectional(valueProperty(), getConverter());
     }
     
     /***************************************************************************