changeset 1455:264470ba524e

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/2.2/scrum/controls/jfx/rt
author jgiles
date Tue, 17 Jul 2012 07:17:30 +1200
parents a6dd0e5c4451 7c7bc01e9da4
children 7839d55ac4c0
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxListViewSkin.java	Mon Jul 16 10:34:22 2012 -0700
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxListViewSkin.java	Tue Jul 17 07:17:30 2012 +1200
@@ -405,7 +405,7 @@
         if (empty) {
             if (buttonCell == null) return;
             cell.setGraphic(null);
-            cell.setText(null);
+            cell.setText(comboBox.getPromptText() == null ? null : comboBox.getPromptText());
         } else if (item instanceof Node) {
             Node currentNode = buttonCell.getGraphic();
             Node newNode = (Node) item;