From 0231f47593cc3778f751821f097d6042d164e9fa Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Thu, 20 Sep 2007 12:43:30 +0000 Subject: [PATCH] Panel now supports all Sizeable units and sends width and height to client as string-variables. svn changeset:2356/svn branch:trunk --- src/com/itmill/toolkit/ui/Panel.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/itmill/toolkit/ui/Panel.java b/src/com/itmill/toolkit/ui/Panel.java index 646d89b40d..d40a0d2f70 100644 --- a/src/com/itmill/toolkit/ui/Panel.java +++ b/src/com/itmill/toolkit/ui/Panel.java @@ -198,8 +198,12 @@ public class Panel extends AbstractComponentContainer implements Sizeable, */ public void paintContent(PaintTarget target) throws PaintException { layout.paint(target); - target.addVariable(this, "height", getHeight()); - target.addVariable(this, "width", getWidth()); + + if(height > -1) + target.addVariable(this, "height", getHeight() + UNIT_SYMBOLS[getHeightUnits()]); + if(width > -1) + target.addVariable(this, "width", getWidth() + UNIT_SYMBOLS[getWidthUnits()]); + if (isScrollable()) { target.addVariable(this, "scrollleft", getScrollOffsetX()); target.addVariable(this, "scrolldown", getScrollOffsetY()); @@ -396,7 +400,7 @@ public class Panel extends AbstractComponentContainer implements Sizeable, * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int) */ public void setHeightUnits(int units) { - // Ignored + heightUnit = units; } /** @@ -406,7 +410,7 @@ public class Panel extends AbstractComponentContainer implements Sizeable, * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int) */ public void setWidthUnits(int units) { - // Ignored + widthUnit = units; } /* Scrolling functionality */ -- 2.39.5