Modified VFilterSelect to consider textfield margin accordingly in its width calculat...

svn changeset:7933/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 01212a33a47edcde4351690568dbd494243f8519..230ef3b44bcdbcb6db19198f95c9e2c53abbb857 100644 (file)
--- 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) {