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

Timestamp:

07/25/08 06:49:03 (6 months ago)

Author:

risto.yrjana@…

Message:

Corrected rendering order, works in Safari but broken in FF

Files:

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

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

@@ -7 +7 @@
 import com.itmill.toolkit.data.Property.ValueChangeListener;
 import com.itmill.toolkit.ui.CheckBox;
+import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.CoordinateLayout;
 import com.itmill.toolkit.ui.GridLayout;
@@ -19 +20 @@
 public class Ticket1267 extends Application {
 
-    final int[] values = new int[6];
     final CoordinateLayout layout = new CoordinateLayout();
-    final Table table = new Table();
-
-    public void updateCoords() {
-        Coordinates newCoord = layout.new Coordinates(values[0], values[1],
-                values[2], values[3], values[4], values[5]);
-        newCoord.setUnitsPercent(true, true, true, true, true, true);
-        layout.setCoordinates(table, newCoord);
-    }
+    Table table = new Table("Test table");
 
     public void init() {
@@ -35 +28 @@
 
         SplitPanel sPanel = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
-        Panel right = new Panel();
-
-        final GridLayout rightLayout = new GridLayout(3, 6);
 
         table.setPageLength(10);
@@ -65 +55 @@
         table.setSizeFull();
         layout.addComponent(table);
+        layout.setCoordinates(table, layout.new Coordinates("0,-1,-1,0,-1,-1"));
 
         Coordinates xy1 = layout.new Coordinates("0, -1, -1, 0, 20%, -1");
@@ -95 +86 @@
          */
 
+        sPanel.addComponent(layout);
+
+        sPanel.addComponent(getControlPanel(table));
+
+        sPanel.setSplitPosition(75);
+
+        main.setLayout(sPanel);
+        setMainWindow(main);
+    }
+
+    public Panel getControlPanel(final Component c) {
+        Panel newPanel = new Panel("Controls for " + c.getCaption());
+        newPanel.setLayout(new GridLayout(3, 6));
+
+        final int[] values = new int[6];
         Arrays.fill(values, -1);
 
@@ -139 +145 @@
                         sliderArray[j].setEnabled(false);
                         labelArray[j].setEnabled(false);
-                        updateCoords();
+
+                        Coordinates newCoord = layout.new Coordinates(
+                                values[0], values[1], values[2], values[3],
+                                values[4], values[5]);
+                        newCoord.setUnitsPercent(true, true, true, true, true,
+                                true);
+                        layout.setCoordinates(c, newCoord);
                     }
                 }
@@ -148 +160 @@
                     Double newValue = (Double) event.getProperty().getValue();
                     values[j] = (int) newValue.doubleValue();
-                    updateCoords();
+
+                    Coordinates newCoord = layout.new Coordinates(values[0],
+                            values[1], values[2], values[3], values[4],
+                            values[5]);
+                    newCoord
+                            .setUnitsPercent(true, true, true, true, true, true);
+                    layout.setCoordinates(c, newCoord);
                     labelArray[j].setValue(new Integer(values[j]));
                 }
@@ -155 +173 @@
 
         for (int i = 0; i < sliderArray.length; i++) {
-            rightLayout.addComponent(checkBoxArray[i]);
-            rightLayout.addComponent(sliderArray[i]);
-            rightLayout.addComponent(labelArray[i]);
+            newPanel.addComponent(checkBoxArray[i]);
+            newPanel.addComponent(sliderArray[i]);
+            newPanel.addComponent(labelArray[i]);
         }
 
-        sPanel.addComponent(layout);
-        right.setLayout(rightLayout);
-        sPanel.addComponent(right);
-
-        sPanel.setSplitPosition(75);
-
-        main.setLayout(sPanel);
-        setMainWindow(main);
+        return newPanel;
     }
 }