From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Thu, 21 May 2009 10:00:56 +0000 (+0000)
Subject: VFilterSelect now removes icon element from DOM if the icon is null. Previously it... 
X-Git-Tag: 6.7.0.beta1~2816
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7e9c1e0f4e65c2704c8fb7afde7455ed6b036bfa;p=vaadin-framework.git

VFilterSelect now removes icon element from DOM if the icon is null. Previously it was only hidden, but the new theme requires it to be removed from the DOM.

svn changeset:7930/svn branch:6.0
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index 8161688513..01212a33a4 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -567,7 +567,6 @@ public class VFilterSelect extends Composite implements Paintable, Field,
     private boolean focused = false;
 
     public VFilterSelect() {
-        selectedItemIcon.setVisible(false);
         selectedItemIcon.setStyleName("v-icon");
         selectedItemIcon.addLoadListener(new LoadListener() {
             public void onError(Widget sender) {
@@ -579,7 +578,6 @@ public class VFilterSelect extends Composite implements Paintable, Field,
             }
         });
 
-        panel.add(selectedItemIcon);
         tb.sinkEvents(VTooltip.TOOLTIP_EVENTS);
         panel.add(tb);
         panel.add(popupOpener);
@@ -787,12 +785,12 @@ public class VFilterSelect extends Composite implements Paintable, Field,
     }
 
     private void setSelectedItemIcon(String iconUri) {
-        if (iconUri == null) {
-            selectedItemIcon.setVisible(false);
+        if (iconUri == null || iconUri == "") {
+            panel.remove(selectedItemIcon);
             updateRootWidth();
         } else {
             selectedItemIcon.setUrl(iconUri);
-            selectedItemIcon.setVisible(true);
+            panel.insert(selectedItemIcon, 0);
             updateRootWidth();
             updateSelectedIconPosition();
         }