From aea71b60ef52f582f3c02468b29b7336369dc02b Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 7 Mar 2012 16:50:15 +0200
Subject: Window layouting changes attempt 2 (#8313)

---
 src/com/vaadin/ui/Window.java | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/com/vaadin/ui/Window.java')

diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index 886a14d1c7..5793bcbd0a 100644
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -21,7 +21,6 @@ import com.vaadin.event.ShortcutAction.ModifierKey;
 import com.vaadin.event.ShortcutListener;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Sizeable;
 import com.vaadin.terminal.gwt.client.ui.VView;
 import com.vaadin.terminal.gwt.client.ui.WindowConnector;
 
@@ -196,15 +195,6 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier {
             centerRequested = false;
         }
 
-        if (getContent() != null) {
-            if (getContent().getHeightUnits() == Sizeable.UNITS_PERCENTAGE) {
-                target.addAttribute("layoutRelativeHeight", true);
-            }
-            if (getContent().getWidthUnits() == Sizeable.UNITS_PERCENTAGE) {
-                target.addAttribute("layoutRelativeWidth", true);
-            }
-        }
-
         // Contents of the window panel is painted
         super.paintContent(target);
 
@@ -232,6 +222,8 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier {
                 && (getHeightUnits() != UNITS_PIXELS || (Integer) variables
                         .get("height") != getHeight())) {
             sizeHasChanged = true;
+            System.out.println("Got height from server: "
+                    + variables.get("height"));
         }
         if (variables.containsKey("width")
                 && (getWidthUnits() != UNITS_PIXELS || (Integer) variables
-- 
cgit v1.2.3