From 686894a2fe37a54e8e0dcedc6ece7368ad7a0659 Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Thu, 1 Jul 2010 07:17:13 +0000 Subject: [PATCH] Fixes #2974 IE6 width problem svn changeset:13985/svn branch:6.4 --- .../terminal/gwt/client/ui/VFilterSelect.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java index f51a2e5120..b72a3b97b4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import com.google.gwt.dom.client.Style.Overflow; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ClickEvent; @@ -1432,8 +1433,17 @@ public class VFilterSelect extends Composite implements Paintable, Field, } else { this.width = width; } - horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder(this, - width, horizPaddingAndBorder); + + if (BrowserInfo.get().isIE6()) { + // Required in IE when textfield is wider than this.width + getElement().getStyle().setOverflow(Overflow.HIDDEN); + horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder( + this, width, horizPaddingAndBorder); + getElement().getStyle().setProperty("overflow", ""); + } else { + horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder( + this, width, horizPaddingAndBorder); + } if (initDone) { updateRootWidth(); @@ -1526,9 +1536,9 @@ public class VFilterSelect extends Composite implements Paintable, Field, int componentWidth; if (BrowserInfo.get().isIE6()) { // Required in IE when textfield is wider than this.width - DOM.setStyleAttribute(getElement(), "overflow", "hidden"); + getElement().getStyle().setOverflow(Overflow.HIDDEN); componentWidth = getOffsetWidth(); - DOM.setStyleAttribute(getElement(), "overflow", ""); + getElement().getStyle().setProperty("overflow", ""); } else { componentWidth = getOffsetWidth(); } -- 2.39.5