diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2008-09-29 09:17:27 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2008-09-29 09:17:27 +0000 |
| commit | 2f931dc3593d37619c4154e0a45bb21ac54811a4 (patch) | |
| tree | 8edb933c07d39016cd240ffd4da06564dfd90901 | |
| parent | 656d5f210cd96837ec6aa41ed737048a3cbb1325 (diff) | |
| download | vaadin-framework-2f931dc3593d37619c4154e0a45bb21ac54811a4.tar.gz vaadin-framework-2f931dc3593d37619c4154e0a45bb21ac54811a4.zip | |
using size attributes instead of variables for reading size values. Gets cleaner values via attributes.
svn changeset:5537/svn branch:trunk
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java | 6 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java | 8 |
2 files changed, 7 insertions, 7 deletions
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 bc29be96fb..57ac865b25 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java @@ -92,9 +92,9 @@ public class IPanel extends SimplePanel implements Paintable, id = uidl.getId(); // Panel size. Height needs to be saved for later use - height = uidl.hasVariable("height") ? uidl.getStringVariable("height") - : null; - setWidth(uidl.hasVariable("width") ? uidl.getStringVariable("width") + height = uidl.hasAttribute("height") ? uidl + .getStringAttribute("height") : null; + setWidth(uidl.hasAttribute("width") ? uidl.getStringAttribute("width") : ""); // Restore default stylenames diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java index 41cbff6d01..193b63f660 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java @@ -234,8 +234,8 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener { * content area. This is due history as earlier only pixels where * allowed. */ - if (uidl.hasVariable("width")) { - final String width = uidl.getStringVariable("width"); + if (uidl.hasAttribute("width")) { + final String width = uidl.getStringAttribute("width"); if (width.indexOf("px") < 0) { /* * Only using non-pixel size for initial size measurement. Then @@ -255,8 +255,8 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener { } // Height set after show so we can detect space used by decorations - if (uidl.hasVariable("height")) { - final String height = uidl.getStringVariable("height"); + if (uidl.hasAttribute("height")) { + final String height = uidl.getStringAttribute("height"); if (height.indexOf("%") > 0) { int winHeight = Window.getClientHeight(); float percent = Float.parseFloat(height.substring(0, height |