diff options
| author | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-05-21 10:34:42 +0000 |
|---|---|---|
| committer | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-05-21 10:34:42 +0000 |
| commit | 0a156061492714f21be141d59f1bc0fe6e4517e3 (patch) | |
| tree | 157f70db51ca2d57decf35fad980f1a9d12eb331 /src | |
| parent | 58ae67e4b3b5398e293756706546979acb822676 (diff) | |
| download | vaadin-framework-0a156061492714f21be141d59f1bc0fe6e4517e3.tar.gz vaadin-framework-0a156061492714f21be141d59f1bc0fe6e4517e3.zip | |
Modified VFilterSelect to consider textfield margin accordingly in its width calculations (needed by the reindeer theme).
svn changeset:7933/svn branch:6.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java | 4 |
1 files changed, 3 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 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) { |