From 21427ab2a60da967c489d6cc86bf9d89eb02412a Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 20 May 2015 20:59:55 +0300
Subject: Render nested invalid layouts correctly (#17598)

Change-Id: I959d62091f79c171a8c9f2c9b4ed2c7a67c65c39
---
 .../com/vaadin/server/ComponentSizeValidator.java  | 41 +++++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

(limited to 'server')

diff --git a/server/src/com/vaadin/server/ComponentSizeValidator.java b/server/src/com/vaadin/server/ComponentSizeValidator.java
index 2d88ae3b53..1fbd840932 100644
--- a/server/src/com/vaadin/server/ComponentSizeValidator.java
+++ b/server/src/com/vaadin/server/ComponentSizeValidator.java
@@ -415,7 +415,7 @@ public class ComponentSizeValidator implements Serializable {
             // main window, valid situation
             return true;
         }
-        if (parent.getHeight() < 0) {
+        if (isEffectiveUndefinedHeight(component)) {
             // Undefined height
             if (parent instanceof Window) {
                 // Sub window with undefined size has a min-height
@@ -513,10 +513,7 @@ public class ComponentSizeValidator implements Serializable {
             // Sub window with undefined size has a min-width
             return true;
         }
-
-        if (parent.getWidth() < 0) {
-            // Undefined width
-
+        if (isEffectiveUndefinedWidth(parent)) {
             if (parent instanceof AbstractOrderedLayout) {
                 AbstractOrderedLayout ol = (AbstractOrderedLayout) parent;
                 boolean horizontal = true;
@@ -591,6 +588,40 @@ public class ComponentSizeValidator implements Serializable {
 
     }
 
+    /**
+     * Checks if this component will be rendered with undefined width, either
+     * because it has been set to undefined wide or because the parent forces it
+     * to be (100% inside undefined)
+     * 
+     */
+    private static boolean isEffectiveUndefinedWidth(Component parent) {
+        if (parent == null) {
+            return false;
+        } else if (parent.getWidth() < 0) {
+            return true;
+        } else if (parent.getWidthUnits() == Unit.PERCENTAGE) {
+            return isEffectiveUndefinedWidth(parent.getParent());
+        }
+        return false;
+    }
+
+    /**
+     * Checks if this component will be rendered with undefined Height, either
+     * because it has been set to undefined wide or because the parent forces it
+     * to be (100% inside undefined)
+     * 
+     */
+    private static boolean isEffectiveUndefinedHeight(Component parent) {
+        if (parent == null) {
+            return false;
+        } else if (parent.getHeight() < 0) {
+            return true;
+        } else if (parent.getHeightUnits() == Unit.PERCENTAGE) {
+            return isEffectiveUndefinedHeight(parent.getParent());
+        }
+        return false;
+    }
+
     private static boolean hasNonRelativeWidthComponent(Form form) {
         Layout layout = form.getLayout();
         Layout footer = form.getFooter();
-- 
cgit v1.2.3