changeset 1644:e1197ad035b8 2.2.25-b05

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/2.2.21/MASTER/jfx/rt
author kcr
date Thu, 04 Apr 2013 17:41:36 -0700
parents 83ac93c0dff7 61c25ccb8167
children a3b7e0235380
files .hgtags
diffstat 3 files changed, 12 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 04 15:03:55 2013 -0700
+++ b/.hgtags	Thu Apr 04 17:41:36 2013 -0700
@@ -87,9 +87,13 @@
 f11e324fc05a93e47713abdb1347bdb7392a1902 2.2.7-b32
 d36dd871f9829fc40894440e908ec573cbd6fd0d 2.2.7-b33
 cc621a6c46d73dabd40da6d982517ebf896d745f 2.2.21-b05
+e09ec1ee61f316aef5928c3dfe5582a5ca07d0dc 2.2.25-b01
 e09ec1ee61f316aef5928c3dfe5582a5ca07d0dc 2.2.21-b06
+988cdeff3b09856fdefb18051110959447969f2c 2.2.25-b02
 848906d6f8b8b2c8823d0e7c89f4ffae5d12b6f3 2.2.21-b07
 4d564505a2740567ff41143339e1b79d39fc778b 2.2.21-b08
+82c046462c4da86379463c1572903c96a92975c8 2.2.25-b03
 e3d18d3b6282da46c0ab21ef2bf9a62b996a0b02 2.2.21-b09
+b46fbd1f74f9afbab72507c39b328f8496561284 2.2.25-b04
 e9ae09d6479cac9e051bd0719ffbea02dd658a77 2.2.21-b10
 d651a3591ddd854a0c93a2d0a1308f7cd9e5bef9 2.2.21-b11
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxListViewSkin.java	Thu Apr 04 15:03:55 2013 -0700
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxListViewSkin.java	Thu Apr 04 17:41:36 2013 -0700
@@ -124,8 +124,10 @@
         
         // move focus in to the textfield if the comboBox is editable
         comboBox.focusedProperty().addListener(new ChangeListener<Boolean>() {
-            @Override public void changed(ObservableValue<? extends Boolean> ov, Boolean t, Boolean t1) {
-                updateFakeFocus(comboBox.isFocused());
+            @Override public void changed(ObservableValue<? extends Boolean> ov, Boolean t, Boolean hasFocus) {
+                if (comboBox.isEditable()) {
+                    updateFakeFocus(hasFocus);
+                }
             }
         });
         
@@ -157,8 +159,6 @@
                         return;
                     }
                 }
-                
-                textField.fireEvent(t);
             }
         });
         
@@ -345,20 +345,7 @@
         // is lost from the ComboBox
         textField.focusedProperty().addListener(new ChangeListener<Boolean>() {
             @Override public void changed(ObservableValue<? extends Boolean> ov, Boolean t, Boolean hasFocus) {
-                if (hasFocus) {
-                    // Using Platform.runLater here, as without it it seems we
-                    // enter into some form of race condition where we are 
-                    // wanting to set focus on the comboBox whilst the textField
-                    // is still notifying of its focus gain.
-                    // This issue was identified in RT-21088.
-                    Platform.runLater(new Runnable() {
-                        @Override public void run() {
-                            comboBox.requestFocus();
-                        }
-                    });
-                }
-                
-                updateFakeFocus(hasFocus);
+                if (! comboBox.isEditable()) return;
                 
                 // RT-21454 starts here
                 if (! hasFocus) {
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TitledPaneSkin.java	Thu Apr 04 15:03:55 2013 -0700
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TitledPaneSkin.java	Thu Apr 04 17:41:36 2013 -0700
@@ -161,7 +161,9 @@
             } else {
                 setTransition(0.0f);
             }
-            contentRegion.setVisible(expanded);
+            if (contentRegion.getContent() != null) {
+                contentRegion.getContent().setVisible(expanded);
+            }
             requestLayout();
         }
     }