From 3b2a7e19d3cc6930f2864e38f078a6120f83fc84 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 21 Nov 2007 12:55:26 +0000 Subject: [PATCH] Small fixes to IPanel and ITabsheet layout functions. IExpandLayout cell overflows set to auto. svn changeset:2880/svn branch:trunk --- .../terminal/gwt/client/ui/IExpandLayout.java | 2 +- .../toolkit/terminal/gwt/client/ui/IPanel.java | 5 ++++- .../toolkit/terminal/gwt/client/ui/ITabsheet.java | 14 +++----------- 3 files changed, 8 insertions(+), 13 deletions(-) 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 05af757c55..3c678f0eb4 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java @@ -155,7 +155,7 @@ public class IExpandLayout extends ComplexPanel implements public VerticalWidgetWrapper() { setElement(DOM.createDiv()); // this is mostly needed for IE, could be isolated - DOM.setStyleAttribute(getContainerElement(), "overflow", "hidden"); + DOM.setStyleAttribute(getContainerElement(), "overflow", "auto"); } void setExpandedSize(int pixels) { 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 b7e6a9c232..2dc03d568c 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java @@ -146,7 +146,10 @@ public class IPanel extends SimplePanel implements Paintable, // Calculate used height super.setHeight(""); - int usedHeight = getOffsetHeight(); + int usedHeight = DOM.getElementPropertyInt(bottomDecoration, + "offsetTop") + + DOM.getElementPropertyInt(bottomDecoration, + "offsetHeight"); // Calculate content area height (don't allow negative values) int h = targetHeight - usedHeight; diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java index 32cffd766c..6eb352b38a 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java @@ -247,21 +247,13 @@ public class ITabsheet extends FlowPanel implements Paintable, DOM.setStyleAttribute(contentNode, "overflow", "hidden"); // Calculate target height - int targetHeight = 0; - /* - * if (height.indexOf("%") > 0) { // Percentage heights are handled - * separately int parentHeight = DOM.getElementPropertyInt(DOM - * .getParent(getElement()), "offsetHeight"); targetHeight = - * parentHeight Integer.parseInt(height.substring(0, height.length() - - * 1)) / 100; } else { - */ super.setHeight(height); - targetHeight = getOffsetHeight(); - // } + int targetHeight = getOffsetHeight(); // Calculate used height super.setHeight(""); - int usedHeight = getOffsetHeight(); + int usedHeight = DOM.getElementPropertyInt(deco, "offsetTop") + + DOM.getElementPropertyInt(deco, "offsetHeight"); // Calculate content area height (don't allow negative values) int h = targetHeight - usedHeight; -- 2.39.5