Changeset 4794

Timestamp:

06/09/08 07:19:19 (3 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

Location:

branches/5.2

Files:

• WebContent/ITMILL/themes/default/gridlayout/gridlayout.css (modified) (1 diff)
• WebContent/ITMILL/themes/default/styles.css (modified) (1 diff)
• src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java (modified) (3 diffs)
• src/com/itmill/toolkit/tests/tickets/Ticket1572.java (modified) (2 diffs)

branches/5.2/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css

@@ -11 +11 @@
         padding-right: 18px;
 }
+
+.i-gridlayout-grid {
+        margin:0;
+        padding:0;
+        border-collapse: collapse;
+        border:0;
+}
+
+.i-gridlayout-cell {
+        margin:0;
+        padding:0;
+}
+
+.i-gridlayout-spacing .i-gridlayout-cell {
+        padding-left: 15px;
+        padding-top:15px;
+}
+
+.i-gridlayout-spacing .i-gridlayout-firstcol {
+        padding-left: 0;
+}
+.i-gridlayout-spacing .i-gridlayout-firstrow {
+        padding-top: 0;
+}

branches/5.2/WebContent/ITMILL/themes/default/styles.css

@@ -513 +513 @@
 }
 
+.i-gridlayout-grid {
+        margin:0;
+        padding:0;
+        border-collapse: collapse;
+        border:0;
+}
+
+.i-gridlayout-cell {
+        margin:0;
+        padding:0;
+}
+
+.i-gridlayout-spacing .i-gridlayout-cell {
+        padding-left: 15px;
+        padding-top:15px;
+}
+.i-gridlayout-spacing .i-gridlayout-firstcol {
+        padding-left: 0;
+}
+.i-gridlayout-spacing .i-gridlayout-firstrow {
+        padding-top: 0;
+}
+
 .i-Notification {
         font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;

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

branches/5.2/src/com/itmill/toolkit/tests/tickets/Ticket1572.java

@@ -47 +47 @@
 
         Button b2 = new Button("next spacing state");
-        b.addListener(new Button.ClickListener() {
+        b2.addListener(new Button.ClickListener() {
             public void buttonClick(ClickEvent event) {
                 nextSpacingState();
@@ -102 +102 @@
     }
 
+    private boolean spacing = true;
+
     private void nextSpacingState() {
-        spacingstate.setValue("        // TODO Auto-generated method stub");
+        spacing = !spacing;
+        if (spacing) {
+            gl.setSpacing(true);
+            spacingstate.setValue("Spacing on");
+        } else {
+            gl.setSpacing(false);
+            spacingstate.setValue("Spacing off");
+        }
     }