diff options
author | John Ahlroos <john@vaadin.com> | 2013-04-17 17:17:39 +0300 |
---|---|---|
committer | John Ahlroos <john@vaadin.com> | 2013-04-17 17:17:39 +0300 |
commit | fc4aeac8b43bb3f200b25a997ade05075592ee90 (patch) | |
tree | 5a6b2cf6610832acf0447674d26308fa37a08bf4 /client/src | |
parent | c7ff7d5dda23f434eb8e056c808c63efefc0d904 (diff) | |
download | vaadin-framework-fc4aeac8b43bb3f200b25a997ade05075592ee90.tar.gz vaadin-framework-fc4aeac8b43bb3f200b25a997ade05075592ee90.zip |
Fixed IE8 scrollbar issue with vertical layout when using both expansions and alignments #11169
Change-Id: Ia62db30e4e7f9bd02966db31b3bb691a1a60e58d
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java b/client/src/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java index 93176f67bb..d8b0888936 100644 --- a/client/src/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java +++ b/client/src/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java @@ -29,6 +29,7 @@ import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.RequiresResize; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.client.BrowserInfo; import com.vaadin.client.LayoutManager; import com.vaadin.client.Util; import com.vaadin.shared.ui.MarginInfo; @@ -411,10 +412,19 @@ public class VAbstractOrderedLayout extends FlowPanel { } else { // Non-relative child without expansion should be unconstrained - if (vertical) { - slotStyle.clearHeight(); + if (BrowserInfo.get().isIE8()) { + // unconstrained in IE8 is auto + if (vertical) { + slot.setHeight("auto"); + } else { + slot.setWidth("auto"); + } } else { - slotStyle.clearWidth(); + if (vertical) { + slotStyle.clearHeight(); + } else { + slotStyle.clearWidth(); + } } } } |