Changeset 5117

Timestamp:

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

Author:

risto.yrjana@…

Message:

Corrected rendering order, works in Safari but broken in FF

Location:

incubator/widgets/coordinatelayout/src/com/itmill/toolkit

Files:

• tests/tickets/Ticket1267.java (modified) (8 diffs)
• ui/gwt/client/ui/ICoordinateLayout.java (modified) (11 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;
     }
 }

incubator/widgets/coordinatelayout/src/com/itmill/toolkit/ui/gwt/client/ui/ICoordinateLayout.java

@@ -53 +53 @@
         DOM.setStyleAttribute(getElement(), "border", "0");
 
-        System.out.println("*** ICoordinateLayout init ***");
+        System.out.println("\n*** ICoordinateLayout init ***");
     }
 
@@ -129 +129 @@
      */
     public void iLayout() {
+        // Run layout functions for children..
+        Util.runDescendentsLayout(this);
 
         // Get our current area
@@ -145 +147 @@
             // Extract the values from the UIDL
             final UIDL componentUIDL = (UIDL) componentIterator.next();
-            final String componentId = componentUIDL.getId();
             final UIDL coords = componentUIDL.getChildUIDL(0);
             final UIDL dimensions = componentUIDL.getChildUIDL(1);
@@ -177 +178 @@
 
                     // Ask the component for its size only once.
-                    if (componentToWidth.get(componentId) == null) {
-                        componentToWidth.put(componentId, new Integer(
-                                componentWidget.getOffsetWidth()));
+                    if (componentToWidth.get(componentDataPaintable) == null) {
+                        componentToWidth.put(componentDataPaintable,
+                                new Integer(componentWidget.getOffsetWidth()));
                     } else {
-                        width = ((Integer) componentToWidth.get(componentId))
-                                .intValue();
+                        width = ((Integer) componentToWidth
+                                .get(componentDataPaintable)).intValue();
                     }
                 }
@@ -199 +200 @@
 
                     // Ask the component for its size only once.
-                    if (componentToHeight.get(componentId) == null) {
-                        componentToHeight.put(componentId, new Integer(
-                                componentWidget.getOffsetHeight()));
+                    if (componentToHeight.get(componentDataPaintable) == null) {
+                        componentToHeight.put(componentDataPaintable,
+                                new Integer(componentWidget.getOffsetHeight()));
                     } else {
-                        height = ((Integer) componentToHeight.get(componentId))
-                                .intValue();
+                        height = ((Integer) componentToHeight
+                                .get(componentDataPaintable)).intValue();
                     }
 
@@ -242 +243 @@
                     absoluteBottom, absoluteLeft, width, height);
 
-        }
-
-        // Run layout functions for children..
-        Util.runDescendentsLayout(this);
+            // Update caption position
+            Caption c = (Caption) componentToCaption
+                    .get(componentDataPaintable);
+            if (c != null) {
+                int cTop = absoluteTop - c.getOffsetHeight();
+                int cRight = absoluteLeft + c.getOffsetWidth();
+                int cBottom = absoluteBottom + height;
+                int cLeft = absoluteLeft;
+
+                setWidgetPosition(c, cTop, cRight, cBottom, cLeft, c
+                        .getOffsetWidth(), c.getOffsetHeight());
+            }
+        }
 
         // ...but make sure they don't change anything important
@@ -284 +294 @@
         DOM.setStyleAttribute(e, "height", Integer.toString(height) + "px");
 
+    }
+
+    public void updateCaption(Paintable component, UIDL uidl) {
+        Caption c = (Caption) componentToCaption.get(component);
+
+        if (Caption.isNeeded(uidl)) {
+            if (c == null) {
+                c = new Caption(component, client);
+                add(c);
+                componentToCaption.put(component, c);
+            }
+            c.updateCaption(uidl);
+        } else if (c != null) {
+            remove(c);
+            componentToCaption.remove(component);
+        }
     }
 
@@ -317 +343 @@
     /*
      * 
-     * @see com.itmill.toolkit.terminal.gwt.client.Container#hasChildComponent(com.google.gwt.user.client.ui.Widget)
+     * @see
+     * com.itmill.toolkit.terminal.gwt.client.Container#hasChildComponent(com
+     * .google.gwt.user.client.ui.Widget)
      */
     public boolean hasChildComponent(Widget w) {
@@ -356 +384 @@
     /*
      * Calculates percentage from value if needed
-     * 
      */
     protected int calculateRealCoord(String key, UIDL coords,
@@ -383 +410 @@
     /*
      * These methods calculate the final coordinates for a given component.
-     * 
      */
     protected int calculateAbsoluteLeft(int width, int left, int right) {
@@ -471 +497 @@
     }
 
-    public void updateCaption(Paintable component, UIDL uidl) {
-        Caption c = (Caption) componentToCaption.get(component);
-
-        if (Caption.isNeeded(uidl)) {
-            if (c == null) {
-                c = new Caption(component, client);
-                add(c);
-                componentToCaption.put(component, c);
-            }
-            c.updateCaption(uidl);
-        } else if (c != null) {
-            remove(c);
-            componentToCaption.remove(component);
-        }
-    }
-
     public boolean remove(Widget w) {
         boolean wasRemoved = super.remove(w);