summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-06-17 20:24:02 +0300
committerTeemu Suo-Anttila <teemusa@vaadin.com>2015-07-07 16:19:36 +0300
commitabc1c5dff6438d65e53473b69ae9a3ca2b8e60e1 (patch)
tree3be3e6e58c5ea70112fa2b650b6d3e81813e3510
parentac4e85f4e35a57d1ba6e6f3448744cbb0c2df60f (diff)
downloadvaadin-framework-abc1c5dff6438d65e53473b69ae9a3ca2b8e60e1.tar.gz
vaadin-framework-abc1c5dff6438d65e53473b69ae9a3ca2b8e60e1.zip
Take Window special case into account for invalid layouts (#17598)
Change-Id: Ie2482df803b7f7004ad0da33ef1df39557f9560b
-rw-r--r--server/src/com/vaadin/server/ComponentSizeValidator.java12
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());