Changeset 4831 for branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java

Timestamp:

06/10/08 09:51:08 (6 months ago)

Author:

magi@…

Message:

Merged [4815] from trunk to 5.2 branch: margins + component spacings for formlayout, removed obsolete comment

Files:

• branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java (modified) (4 diffs)

branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java

@@ -18 +18 @@
 import com.itmill.toolkit.terminal.gwt.client.ErrorMessage;
 import com.itmill.toolkit.terminal.gwt.client.Paintable;
+import com.itmill.toolkit.terminal.gwt.client.StyleConstants;
 import com.itmill.toolkit.terminal.gwt.client.UIDL;
 import com.itmill.toolkit.terminal.gwt.client.Util;
@@ -26 +27 @@
 public class IFormLayout extends FlexTable implements Container {
 
+    private final static String CLASSNAME = "i-formlayout";
+
     HashMap componentToCaption = new HashMap();
     private ApplicationConnection client;
@@ -36 +39 @@
             return;
         }
+
+        final MarginInfo margins = new MarginInfo(uidl
+                .getIntAttribute("margins"));
+
+        Element margin = getElement();
+        setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_TOP,
+                margins.hasTop());
+        setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_RIGHT,
+                margins.hasRight());
+        setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_BOTTOM,
+                margins.hasBottom());
+        setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_LEFT,
+                margins.hasLeft());
+
+        setStyleName(margin, CLASSNAME + "-" + "spacing", uidl
+                .hasAttribute("spacing"));
 
         int i = 0;
@@ -60 +79 @@
                 setWidget(i, 2, (Widget) p);
             }
-            getCellFormatter().setStyleName(i, 0, "i-formlayout-captioncell");
+            getCellFormatter().setStyleName(i, 2, CLASSNAME + "-contentcell");
+            getCellFormatter().setStyleName(i, 0, CLASSNAME + "-captioncell");
             setWidget(i, 0, caption);
 
-            getCellFormatter().setStyleName(i, 1, "i-formlayout-errorcell");
+            getCellFormatter().setStyleName(i, 1, CLASSNAME + "-errorcell");
             setWidget(i, 1, error);
 
             p.updateFromUIDL(childUidl, client);
+
+            String rowstyles = CLASSNAME + "-row";
+            if (i == 0) {
+                rowstyles += " " + CLASSNAME + "-firstrow";
+            }
+            if (!it.hasNext()) {
+                rowstyles += " " + CLASSNAME + "-lastrow";
+            }
+
+            getRowFormatter().setStyleName(i, rowstyles);
 
         }