From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 21 Nov 2007 12:25:06 +0000 (+0000)
Subject: IExpandLayout: fixed bottom margin detection
X-Git-Tag: 6.7.0.beta1~5527
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=091a33b2ef8b4950bffad80fdc701b1b6858ec35;p=vaadin-framework.git

IExpandLayout: fixed bottom margin detection

svn changeset:2878/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
index f4e71cfc92..05af757c55 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
@@ -426,10 +426,11 @@ public class IExpandLayout extends ComplexPanel implements
 
             int marginTop = DOM.getElementPropertyInt(DOM.getFirstChild(me),
                     "offsetTop")
-                    - DOM.getElementPropertyInt(me, "offsetTop");
+                    - DOM.getElementPropertyInt(element, "offsetTop");
 
             Element lastElement = DOM.getChild(me, (DOM.getChildCount(me) - 1));
             int marginBottom = DOM.getElementPropertyInt(me, "offsetHeight")
+                    + DOM.getElementPropertyInt(me, "offsetTop")
                     - (DOM.getElementPropertyInt(lastElement, "offsetTop") + DOM
                             .getElementPropertyInt(lastElement, "offsetHeight"));
             size -= (marginTop + marginBottom); // FIXME expects same size