]> source.dussan.org Git - vaadin-framework.git/commitdiff
IE6 fix for #2157
authorArtur Signell <artur.signell@itmill.com>
Tue, 21 Oct 2008 13:26:55 +0000 (13:26 +0000)
committerArtur Signell <artur.signell@itmill.com>
Tue, 21 Oct 2008 13:26:55 +0000 (13:26 +0000)
svn changeset:5688/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java

index 8ef567413e5448995b8e592bdaea402c33f95a38..ec1bb2b3b7d29aaa36fda202224e4d6b3253bd9d 100644 (file)
@@ -28,6 +28,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.PopupPanel.PositionCallback;
 import com.google.gwt.user.client.ui.SuggestOracle.Suggestion;
 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
+import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
 import com.itmill.toolkit.terminal.gwt.client.Focusable;
 import com.itmill.toolkit.terminal.gwt.client.ITooltip;
 import com.itmill.toolkit.terminal.gwt.client.Paintable;
@@ -839,8 +840,19 @@ public class IFilterSelect extends Composite implements Paintable, Field,
              * When the width is specified we also want to explicitly specify
              * widths for textbox and popupopener
              */
-            int textboxWidth = getOffsetWidth() - getElementPadding()
-                    - popupOpener.getOffsetWidth();
+            int offsetWidth;
+            if (BrowserInfo.get().isIE6()) {
+                // Required in IE6 when textfield is wider than this.width
+                DOM.setStyleAttribute(getElement(), "overflow", "hidden");
+                offsetWidth = getOffsetWidth();
+                DOM.setStyleAttribute(getElement(), "overflow", "");
+
+            } else {
+                offsetWidth = getOffsetWidth();
+            }
+            int padding = getElementPadding();
+            int popupOpenerWidth = popupOpener.getOffsetWidth();
+            int textboxWidth = offsetWidth - padding - popupOpenerWidth;
             if (textboxWidth < 0) {
                 textboxWidth = 0;
             }