Changeset 5117 for incubator/widgets/coordinatelayout/src/com/itmill/toolkit/ui/gwt/client/ui/ICoordinateLayout.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/ui/gwt/client/ui/ICoordinateLayout.java (modified) (11 diffs)

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);