diff options
| author | Artur Signell <artur.signell@itmill.com> | 2010-12-07 10:34:40 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2010-12-07 10:34:40 +0000 |
| commit | 8e08b7f606b1af2295edaa77b4406628e1d89371 (patch) | |
| tree | 2263dba2504ba4a7ce2fac046d9617c8206ba4e8 /src | |
| parent | c2aa19f4f488818d4aed799248e69b9fb735bea8 (diff) | |
| download | vaadin-framework-8e08b7f606b1af2295edaa77b4406628e1d89371.tar.gz vaadin-framework-8e08b7f606b1af2295edaa77b4406628e1d89371.zip | |
Fixed height issue in IE6
svn changeset:16349/svn branch:6.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java index 9771e8b9fa..4d74181011 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java @@ -25,6 +25,7 @@ import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.Panel;
import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
import com.vaadin.terminal.gwt.client.UIDL;
import com.vaadin.terminal.gwt.client.Util;
@@ -413,7 +414,16 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, private void setInternalHeights() {
int captionHeight = 0;
- int totalHeight = getOffsetHeight();
+ int totalHeight;
+ if (BrowserInfo.get().isIE6()) {
+ String o = getElement().getStyle().getOverflow();
+
+ getElement().getStyle().setOverflow(Overflow.HIDDEN);
+ totalHeight = getOffsetHeight();
+ getElement().getStyle().setProperty("overflow", o);
+ } else {
+ totalHeight = getOffsetHeight();
+ }
if (optionsCaption != null) {
captionHeight = Util.getRequiredHeight(optionsCaption);
|