aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2008-09-16 08:53:56 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2008-09-16 08:53:56 +0000
commit238e7f7666a955f2037ed45d2d278ff515ff1ada (patch)
treee0e3c6efd9c22dd10206e283cfa38df3a966bd91 /src
parent180e0d03dfdc91bb0a2b6a5aa8ff53d81ef87e60 (diff)
downloadvaadin-framework-238e7f7666a955f2037ed45d2d278ff515ff1ada.tar.gz
vaadin-framework-238e7f7666a955f2037ed45d2d278ff515ff1ada.zip
sanity check for tabsheet height, fixes error in IE if becomes too small
svn changeset:5410/svn branch:trunk
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java5
1 files changed, 4 insertions, 1 deletions
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 fc2f6b12ae..1a0eb557fc 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
@@ -380,9 +380,12 @@ public class ITabsheet extends ITabsheetBase implements
if (height != null && height != "") {
super.setHeight(height);
- final int contentHeight = getOffsetHeight()
+ int contentHeight = getOffsetHeight()
- DOM.getElementPropertyInt(deco, "offsetHeight")
- tb.getOffsetHeight();
+ if (contentHeight < 0) {
+ contentHeight = 0;
+ }
// Set proper values for content element
DOM.setStyleAttribute(contentNode, "height", contentHeight + "px");