Changeset 4794 for branches/5.2/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java

Timestamp:

06/09/08 07:19:19 (6 months ago)

Author:

magi@…

Message:

Merged [4769] from trunk to 5.2 branch: #1572 (GridLayout? : setMargin(true) nor setComponentSpacing(true) does nothing in non-sized grid): updated test case and spacing implementation

Files:

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

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

@@ -57 +57 @@
                 margins.hasLeft());
 
+        setStyleName(margin, CLASSNAME + "-" + "spacing", uidl
+                .hasAttribute("spacing"));
+
         grid.updateFromUIDL(uidl, client);
     }
@@ -79 +82 @@
         public Grid() {
             super();
-            setStyleName(CLASSNAME);
+            setStyleName(CLASSNAME + "-grid");
         }
 
@@ -133 +136 @@
                             }
 
-                            getCellFormatter()
-                                    .setAlignment(row, column, ha, va);
+                            FlexCellFormatter formatter = (FlexCellFormatter) getCellFormatter();
+
+                            formatter.setAlignment(row, column, ha, va);
 
                             // set col span
-                            ((FlexCellFormatter) getCellFormatter())
-                                    .setColSpan(row, column, w);
+                            formatter.setColSpan(row, column, w);
+
+                            String styleNames = CLASSNAME + "-cell";
+                            if (column == 0) {
+                                styleNames += " " + CLASSNAME + "-firstcol";
+                            }
+                            if (row == 0) {
+                                styleNames += " " + CLASSNAME + "-firstrow";
+                            }
+                            formatter.setStyleName(row, column, styleNames);
 
                             // Set cell height