aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java
index 0b91268d25..1639b6693b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java
@@ -75,11 +75,10 @@ public class IForm extends ComplexPanel implements Container {
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
rendering = true;
-
+ boolean measure = false;
if (this.client == null) {
this.client = client;
- borderPaddingVertical = getOffsetHeight();
- borderPaddingHorizontal = getOffsetWidth() - desc.getOffsetWidth();
+ measure = true;
}
if (client.updateComponent(this, uidl, false)) {
@@ -87,6 +86,14 @@ public class IForm extends ComplexPanel implements Container {
return;
}
+ if (measure) {
+ // Measure the border when the style names have been set
+ borderPaddingVertical = getOffsetHeight();
+ int ow = getOffsetWidth();
+ int dow = desc.getOffsetWidth();
+ borderPaddingHorizontal = ow - dow;
+ }
+
boolean legendEmpty = true;
if (uidl.hasAttribute("caption")) {
DOM.setInnerText(caption, uidl.getStringAttribute("caption"));