Panel now supports all Sizeable units and sends width and height to client as string...

svn changeset:2356/svn branch:trunk

diff --git a/src/com/itmill/toolkit/ui/Panel.java b/src/com/itmill/toolkit/ui/Panel.java
index 646d89b40d023ac2019f2fe7109bb08756b08561..d40a0d2f70c8839ed7d68e862b6f64ea06ef8981 100644 (file)
--- 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 */