changeset 1454:7c7bc01e9da4

Backed out changeset: e848c165aaa9 (RT-22972: ComboBox with dynamic item list : issue with the "Empty" label)
author jgiles
date Tue, 17 Jul 2012 07:16:51 +1200
parents 5ba93f3d48b7
children 264470ba524e
files javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxListViewSkin.java
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 11:57:46 2012 +1200
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxListViewSkin.java	Tue Jul 17 07:16:51 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;