1 files changed, 12 insertions, 0 deletions
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());