From 8c4c9d539d67cb746e8c16a0866e9ef0568eb26e Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Thu, 2 Oct 2008 07:56:48 +0000 Subject: [PATCH] fixes #2132, margin where reduced two times from the size given to children in some situations svn changeset:5581/svn branch:trunk --- .../terminal/gwt/client/ui/IOrderedLayout.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java index 05df68cd88..7e39db07c0 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java @@ -1365,17 +1365,10 @@ public class IOrderedLayout extends Panel implements Container, // This should not be possible... return 0; + } else { + return lastForcedPixelHeight; } - int available = lastForcedPixelHeight; - available -= reduce; - - // Must remove caption height to report correct size to child - // if (caption != null) { - // available -= caption.getOffsetHeight(); - // } - - return available; } public int getAllocatedWidth() { @@ -1391,7 +1384,7 @@ public class IOrderedLayout extends Panel implements Container, */ return getElementWrappingClipperDiv().getOffsetWidth() - reduce; } else if (lastForcedPixelWidth > -1) { - return lastForcedPixelWidth - reduce; + return lastForcedPixelWidth; } else { return 0; } -- 2.39.5