diff options
| author | Automerge <automerge@vaadin.com> | 2012-05-15 09:09:09 +0000 |
|---|---|---|
| committer | Automerge <automerge@vaadin.com> | 2012-05-15 09:09:09 +0000 |
| commit | b5486bce95d754a3fd1ff169679c4714c42154ee (patch) | |
| tree | 584e72d2523192e77bc16365b05ed6c5b3bf79a0 | |
| parent | adf89bd4dbd637ff4641efe3c544f8d9d3c560d7 (diff) | |
| download | vaadin-framework-b5486bce95d754a3fd1ff169679c4714c42154ee.tar.gz vaadin-framework-b5486bce95d754a3fd1ff169679c4714c42154ee.zip | |
[merge from 6.7] #5521 fixed condition that was always checking for height, not width
svn changeset:23740/svn branch:6.8
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java index abebf0ea4a..ec4c5d9cba 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VView.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java @@ -446,7 +446,8 @@ public class VView extends SimplePanel implements Container, ResizeHandler, .getProperty(direction))) { parentOfVApp.getStyle().setProperty(direction, "100%"); } - } else if (parentOfVApp.getStyle().getHeight().contains("%")) { + } else if (parentOfVApp.getStyle().getProperty(direction) + .contains("%")) { // if layout size is undefined or fixed and we have set a // percentual size for portlet-body, remove size setting on // portlet body |