From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 22 Nov 2007 10:48:03 +0000 (+0000)
Subject: fixing iLayout function when Panel is not the first object in container
X-Git-Tag: 6.7.0.beta1~5522
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=392a80c3fbecd8108bb52824dbed1491c34e476d;p=vaadin-framework.git

fixing iLayout function when Panel is not the first object in container

svn changeset:2888/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
index 2dc03d568c..84a34992a4 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
@@ -51,11 +51,12 @@ public class IPanel extends SimplePanel implements Paintable,
 
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         // Ensure correct implementation
-        if (client.updateComponent(this, uidl, false))
+        if (client.updateComponent(this, uidl, false)) {
             return;
+        }
 
         this.client = client;
-        this.id = uidl.getId();
+        id = uidl.getId();
 
         // Panel size. Height needs to be saved for later use
         String w = uidl.hasVariable("width") ? uidl.getStringVariable("width")
@@ -149,7 +150,8 @@ public class IPanel extends SimplePanel implements Paintable,
             int usedHeight = DOM.getElementPropertyInt(bottomDecoration,
                     "offsetTop")
                     + DOM.getElementPropertyInt(bottomDecoration,
-                            "offsetHeight");
+                            "offsetHeight")
+                    - DOM.getElementPropertyInt(getElement(), "offsetTop");
 
             // Calculate content area height (don't allow negative values)
             int h = targetHeight - usedHeight;