summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/ui/Window.java
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-03-07 16:50:15 +0200
committerLeif Åstrand <leif@vaadin.com>2012-03-07 16:50:15 +0200
commitaea71b60ef52f582f3c02468b29b7336369dc02b (patch)
tree1ee68aa2aa490a6ae67cf075df6763cb8c18d32a /src/com/vaadin/ui/Window.java
parent3b0565b19498aaca12b224650a70de827dc8b70c (diff)
downloadvaadin-framework-aea71b60ef52f582f3c02468b29b7336369dc02b.tar.gz
vaadin-framework-aea71b60ef52f582f3c02468b29b7336369dc02b.zip
Window layouting changes attempt 2 (#8313)
Diffstat (limited to 'src/com/vaadin/ui/Window.java')
-rw-r--r--src/com/vaadin/ui/Window.java12
1 files changed, 2 insertions, 10 deletions
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