diff options
| author | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-05-22 08:25:14 +0000 |
|---|---|---|
| committer | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-05-22 08:25:14 +0000 |
| commit | 23920c27ee10cbb65255d381559549e6de2b9465 (patch) | |
| tree | ff7d3ed3a2904a8582cb56ab78b93d60716cd01a | |
| parent | d2f7355a079d0d2a79b36bf827b052db9a02eeea (diff) | |
| download | vaadin-framework-23920c27ee10cbb65255d381559549e6de2b9465.tar.gz vaadin-framework-23920c27ee10cbb65255d381559549e6de2b9465.zip | |
Fixed regression caused by [7930] (VFilterSelect crashed in IE).
svn changeset:7950/svn branch:6.0
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |