From: John Alhroos <john.ahlroos@itmill.com>
Date: Tue, 26 Oct 2010 09:10:47 +0000 (+0000)
Subject: Fix for #5882
X-Git-Tag: 6.7.0.beta1~919^2~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ae45d975e2c4fec76efdcd88804a8384e066d163;p=vaadin-framework.git

Fix for #5882

svn changeset:15706/svn branch:6.4
---

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");
     }