From: Artur Signell <artur@vaadin.com>
Date: Wed, 17 Jun 2015 17:24:02 +0000 (+0300)
Subject: Take Window special case into account for invalid layouts (#17598)
X-Git-Tag: 7.6.0.alpha2~5^2~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1eaa302928c0a653885cfdaa552806f899f8ed60;p=vaadin-framework.git

Take Window special case into account for invalid layouts (#17598)

Change-Id: If736e0d35376f90dee33d93588351ef726a4635f
---

diff --git a/server/src/com/vaadin/server/ComponentSizeValidator.java b/server/src/com/vaadin/server/ComponentSizeValidator.java
index 1fbd840932..71023782ef 100644
--- a/server/src/com/vaadin/server/ComponentSizeValidator.java
+++ b/server/src/com/vaadin/server/ComponentSizeValidator.java
@@ -598,6 +598,12 @@ public class ComponentSizeValidator implements Serializable {
         if (parent == null) {
             return false;
         } else if (parent.getWidth() < 0) {
+            if (parent instanceof Window) {
+                // Window has some weird haxxors to support 100% children when
+                // window is -1
+                return false;
+            }
+
             return true;
         } else if (parent.getWidthUnits() == Unit.PERCENTAGE) {
             return isEffectiveUndefinedWidth(parent.getParent());
@@ -615,6 +621,12 @@ public class ComponentSizeValidator implements Serializable {
         if (parent == null) {
             return false;
         } else if (parent.getHeight() < 0) {
+            if (parent instanceof Window) {
+                // Window has some weird haxxors to support 100% children when
+                // window is -1
+                return false;
+            }
+
             return true;
         } else if (parent.getHeightUnits() == Unit.PERCENTAGE) {
             return isEffectiveUndefinedHeight(parent.getParent());