diff options
| author | John Alhroos <john.ahlroos@itmill.com> | 2010-10-26 09:10:47 +0000 |
|---|---|---|
| committer | John Alhroos <john.ahlroos@itmill.com> | 2010-10-26 09:10:47 +0000 |
| commit | ae45d975e2c4fec76efdcd88804a8384e066d163 (patch) | |
| tree | 360558d985645186e0097ed8de4a7ee7b2c8dd07 /src/com/vaadin/terminal | |
| parent | 615524bd3eb3faa34e5b18e4281523b21727e19e (diff) | |
| download | vaadin-framework-ae45d975e2c4fec76efdcd88804a8384e066d163.tar.gz vaadin-framework-ae45d975e2c4fec76efdcd88804a8384e066d163.zip | |
Fix for #5882
svn changeset:15706/svn branch:6.4
Diffstat (limited to 'src/com/vaadin/terminal')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java index 59dd4f9611..d06d6b11a3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java @@ -1,4 +1,4 @@ -/* +/* @ITMillApache2LicenseForJavaFiles@ */ @@ -413,8 +413,10 @@ public class VGridLayout extends SimplePanel implements Paintable, Container { int canvasHeight; if ("".equals(height)) { canvasHeight = y - spacingPixelsVertical; - } else { + } else if (getOffsetHeight() > marginTopAndBottom) { canvasHeight = getOffsetHeight() - marginTopAndBottom; + } else { + canvasHeight = 0; } canvas.setHeight(canvasHeight + "px"); } |