From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Fri, 22 May 2009 08:25:14 +0000 (+0000)
Subject: Fixed regression caused by [7930] (VFilterSelect crashed in IE).
X-Git-Tag: 6.7.0.beta1~2802
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=23920c27ee10cbb65255d381559549e6de2b9465;p=vaadin-framework.git

Fixed regression caused by [7930] (VFilterSelect crashed in IE).

svn changeset:7950/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 230ef3b44b..4b13c22cce 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -1028,7 +1028,8 @@ public class VFilterSelect extends Composite implements Paintable, Field,
     private void setTextboxWidth(int componentWidth) {
         int padding = getTextboxPadding();
         int popupOpenerWidth = Util.getRequiredWidth(popupOpener);
-        int iconWidth = Util.getRequiredWidth(selectedItemIcon);
+        int iconWidth = selectedItemIcon.isAttached() ? Util
+                .getRequiredWidth(selectedItemIcon) : 0;
         int textboxWidth = componentWidth - padding - popupOpenerWidth
                 - iconWidth;
         if (textboxWidth < 0) {