From b4a45bddbc3e5471f8eff82313e34293fcc673a9 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Wed, 1 Oct 2008 12:32:42 +0000 Subject: [PATCH] Fixed ScrollTable relative height calculation svn changeset:5579/svn branch:trunk --- .../toolkit/terminal/gwt/client/ui/IScrollTable.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java index 3a3c509e09..0d0f224fe8 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java @@ -707,7 +707,7 @@ public class IScrollTable extends Composite implements Table, ScrollListener, public void iLayout() { if (height != null) { - if (height.equals("100%")) { + if (height.contains("%")) { /* * We define height in pixels with 100% not to include borders * which is what users usually want. So recalculate pixels via @@ -2326,20 +2326,13 @@ public class IScrollTable extends Composite implements Table, ScrollListener, float relativeHeight = Util.parseRelativeSize(height); if (relativeHeight >= 0) { final int borders = getBorderSpace(); - ApplicationConnection.getConsole().log("Table borders: " + borders); Size available = Util.getLayout(this).getAllocatedSpace(this); - ApplicationConnection.getConsole().log( - "Table available space: " + available); int actual = available.getHeight(); - ApplicationConnection.getConsole().log("actual 1: " + actual); actual -= borders; - ApplicationConnection.getConsole().log("actual 2: " + actual); actual *= relativeHeight / 100.0; - ApplicationConnection.getConsole().log( - "Table height: " + actual + "px"); if (actual < 0) { actual = 0; } -- 2.39.5