Changeset 5258 for incubator/widgets/coordinatelayout/src/com/itmill/toolkit/tests/tickets/Ticket1267.java

Timestamp:

08/25/08 10:51:54 (5 months ago)

Author:

risto.yrjana@…

Message:

Changed DOM-structure: caption positioning broken, component growth fixed

Files:

• incubator/widgets/coordinatelayout/src/com/itmill/toolkit/tests/tickets/Ticket1267.java (modified) (13 diffs)

incubator/widgets/coordinatelayout/src/com/itmill/toolkit/tests/tickets/Ticket1267.java

@@ -14 +14 @@
 import com.itmill.toolkit.ui.GridLayout;
 import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.Layout;
 import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.Panel;
+import com.itmill.toolkit.ui.Select;
 import com.itmill.toolkit.ui.Slider;
 import com.itmill.toolkit.ui.Table;
@@ -23 +25 @@
 public class Ticket1267 extends Application {
 
-    final CoordinateLayout layout = new CoordinateLayout();
+    final CoordinateLayout coordinateLayout = new CoordinateLayout();
 
     public void init() {
@@ -32 +34 @@
         // SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
 
-        layout.setBorders(true);
+        coordinateLayout.setMargin(true);
+        coordinateLayout.setMargin(true, true, true, true);
 
         // Setup table
@@ -60 +63 @@
         }
 
-        layout.addComponent(table);
-        table.setSizeFull();
-        layout.setCoordinates(table, new CoordinateLayout.Coordinates(
-                "0,0,0,0,-1,-1"));
+        coordinateLayout.addComponent(table);
+        coordinateLayout.setCoordinates(table,
+                new CoordinateLayout.Coordinates("0,0,-1,-1"));
 
         CoordinateLayout.Coordinates xy = new CoordinateLayout.Coordinates(40,
@@ -69 +71 @@
         xy.setUnitsPercent(true, true, true, true, false, false);
 
-        layout.addComponent(
-                new TextField("Caption", "TextField with a caption"), xy);
+        coordinateLayout.addComponent(new TextField("Caption",
+                "TextField with a caption"), xy);
 
         final DateField dateField = new DateField("Removal test");
-        layout.addComponent(dateField);
+        // coordinateLayout.addComponent(dateField);
 
         final Panel panel = new Panel("TestPanel");
-        layout.addComponent(panel, "-1,0,0%,-1,-1,-1%");
+        // coordinateLayout.addComponent(panel, "0,-1,-1,-1,-1,0");
+
+        final Layout ol = new OrderedLayout();
+        ol.addComponent(new Select("Select inside layouts", table
+                .getContainerDataSource()));
+        ol.addComponent(new Select("Select inside layouts", table
+                .getContainerDataSource()));
+        ol.addComponent(new Select("Select inside layouts", table
+                .getContainerDataSource()));
+
+        // CoordinateLayout.Coordinates xy2 = new CoordinateLayout.Coordinates(
+        // "-1,-1,0,0,200,200");
+        // coordinateLayout.addComponent(ol, xy2);
 
         Button b1 = new Button("Add contents to panel");
@@ -93 +107 @@
             public void buttonClick(Button.ClickEvent e) {
                 if (bottom) {
-                    layout.sendToTop(panel);
+                    coordinateLayout.sendToTop(panel);
                     bottom = false;
                 } else {
-                    layout.sendToBottom(panel);
+                    coordinateLayout.sendToBottom(panel);
                     bottom = true;
                 }
@@ -105 +119 @@
         b3.addListener(new Button.ClickListener() {
             public void buttonClick(Button.ClickEvent e) {
-                layout.setBorders(!layout.hasBorders());
+                coordinateLayout.setBorders(!coordinateLayout.hasBorders());
             }
         });
@@ -113 +127 @@
             public void buttonClick(Button.ClickEvent e) {
                 e.getButton().setEnabled(false);
-                layout.removeComponent(dateField);
+                coordinateLayout.removeComponent(dateField);
             }
         });
@@ -120 +134 @@
         b5.addListener(new Button.ClickListener() {
             public void buttonClick(Button.ClickEvent e) {
-                layout.requestRepaint();
-            }
-        });
-
-        // Setup layout for splitpanel
+                coordinateLayout.requestRepaint();
+            }
+        });
+
+        // Setup coordinateLayout for right
         OrderedLayout right = new OrderedLayout();
         right.addComponent(getControlPanel(table));
@@ -134 +148 @@
         right.addComponent(b5);
 
-        // sPanel.addComponent(layout);
+        // sPanel.addComponent(coordinateLayout);
         // sPanel.addComponent(right);
         //
@@ -143 +157 @@
         ExpandLayout mainLayout = new ExpandLayout(
                 ExpandLayout.ORIENTATION_HORIZONTAL);
-        mainLayout.addComponent(layout);
+        mainLayout.addComponent(coordinateLayout);
         mainLayout.addComponent(right);
         main.setLayout(mainLayout);
@@ -207 +221 @@
                         newCoord.setUnitsPercent(true, true, true, true, true,
                                 true);
-                        layout.setCoordinates(c, newCoord);
+                        coordinateLayout.setCoordinates(c, newCoord);
                     }
                 }
@@ -222 +236 @@
                     newCoord
                             .setUnitsPercent(true, true, true, true, true, true);
-                    layout.setCoordinates(c, newCoord);
+                    coordinateLayout.setCoordinates(c, newCoord);
                     labelArray[j].setValue(new Integer(values[j]));
                 }