From 0a156061492714f21be141d59f1bc0fe6e4517e3 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Thu, 21 May 2009 10:34:42 +0000 Subject: [PATCH] Modified VFilterSelect to consider textfield margin accordingly in its width calculations (needed by the reindeer theme). svn changeset:7933/svn branch:6.0 --- src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java index 01212a33a4..230ef3b44b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java @@ -981,7 +981,9 @@ public class VFilterSelect extends Composite implements Paintable, Field, */ int tbWidth = Util.getRequiredWidth(tb); int openerWidth = Util.getRequiredWidth(popupOpener); - int iconWidth = Util.getRequiredWidth(selectedItemIcon); + int iconWidth = selectedItemIcon.isAttached() ? Util + .measureMarginLeft(tb.getElement()) + - Util.measureMarginLeft(selectedItemIcon.getElement()) : 0; int w = tbWidth + openerWidth + iconWidth; if (suggestionPopupMinWidth > w) { -- 2.39.5