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 59dd4f96111dd631aaa69582da622a8d2f0fe2ab..d06d6b11a3ccebafcc3465ce1de3af3f29c9cbed 100644 (file)
--- 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");
     }