diff options
author | Artur Signell <artur.signell@itmill.com> | 2008-10-21 13:26:55 +0000 |
---|---|---|
committer | Artur Signell <artur.signell@itmill.com> | 2008-10-21 13:26:55 +0000 |
commit | 8497f5f1ec7145e0c87daba11eb06fbf3b16ae4b (patch) | |
tree | a86a3082fa8db1fbe6f3eaf60a668e6e97c4d972 | |
parent | cda2700df852d1bc1ed66893385862ea92ac9351 (diff) | |
download | vaadin-framework-8497f5f1ec7145e0c87daba11eb06fbf3b16ae4b.tar.gz vaadin-framework-8497f5f1ec7145e0c87daba11eb06fbf3b16ae4b.zip |
IE6 fix for #2157
svn changeset:5688/svn branch:trunk
-rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java index 8ef567413e..ec1bb2b3b7 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java @@ -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; } |