From 559001907bffce9b3d592920dd0d5434ecd9de8f Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 15 Nov 2011 16:44:05 +0000
Subject: #7056 inconsistency between Chameleon theme and standard Vaadin theme
 concerning Combobox

svn changeset:22013/svn branch:6.7
---
 src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index ae7ee1a653..ebaf797e09 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -100,7 +100,15 @@ public class VFilterSelect extends Composite implements Paintable, Field,
                 sb.append(Util.escapeAttribute(iconUri));
                 sb.append("\" alt=\"\" class=\"v-icon\" />");
             }
-            sb.append("<span>" + Util.escapeHTML(caption) + "</span>");
+            String content;
+            if ("".equals(caption)) {
+                // Ensure that empty options use the same height as other
+                // options and are not collapsed (#7506)
+                content = "&nbsp;";
+            } else {
+                content = Util.escapeHTML(caption);
+            }
+            sb.append("<span>" + content + "</span>");
             return sb.toString();
         }
 
-- 
cgit v1.2.3