From ae45d975e2c4fec76efdcd88804a8384e066d163 Mon Sep 17 00:00:00 2001 From: John Alhroos <john.ahlroos@itmill.com> Date: Tue, 26 Oct 2010 09:10:47 +0000 Subject: Fix for #5882 svn changeset:15706/svn branch:6.4 --- src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/com/vaadin/terminal') 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"); } -- cgit v1.2.3