fixes #2132, margin where reduced two times from the size given to children in some...

svn changeset:5581/svn branch:trunk

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 05df68cd8885eaa67a9b3418b36dbb13ba97bbfc..7e39db07c0aa3fc94a2fe25e5041876eeade4119 100644 (file)
--- 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;
             }