From 8c21a6f36ea05bfa48b34d6162bc5a2fe3fa488b Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 9 Apr 2009 13:04:37 +0000
Subject: Merged fix for #2839 - Form should not measure borders before style
 names are set.

svn changeset:7382/svn branch:6.0
---
 src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java | 13 ++++++++++---
 1 file 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"));
-- 
cgit v1.2.3