Changeset 5264

Timestamp:

08/26/08 06:42:31 (3 months ago)

Author:

risto.yrjana@…

Message:

Updated coordinate ordering, fixed captions

Location:

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

Files:

• CoordinateLayout.java (modified) (6 diffs)
• gwt/client/CoordinateLayoutWidgetSet.java (modified) (2 diffs)
• gwt/client/ui/ICoordinateLayout.java (modified) (9 diffs)

incubator/widgets/coordinatelayout/src/com/itmill/toolkit/ui/CoordinateLayout.java

@@ -32 +32 @@
 
     /**
-     * Creates an empty coordinatelayout. The coordinateLayout is full size by default.
+     * Creates an empty coordinatelayout. The coordinateLayout is full size by
+     * default.
      */
     public CoordinateLayout() {
@@ -45 +46 @@
     /**
      * 
-     * Adds a component to the coordinateLayout at the specified coordinates. The values
-     * are treated as pixel values by default and for example
+     * Adds a component to the coordinateLayout at the specified coordinates.
+     * The values are treated as pixel values by default and for example
      * {@link com.itmill.toolkit.ui.CoordinateLayout.Coordinates#setUnitPercent(int, boolean)}
      * can be used to set the values as percentage.
@@ -135 +136 @@
 
     /**
-     * Adds a component to the coordinateLayout at the specified coordinates. Null
-     * arguments are not permitted and will throw an IllegalArgumentException.
+     * Adds a component to the coordinateLayout at the specified coordinates.
+     * Null arguments are not permitted and will throw an
+     * IllegalArgumentException.
      * 
      * @param c
@@ -279 +281 @@
      * Replaces a child component with a new one. The new component uses the
      * same coordinates as the previous component. If the arguments are null or
-     * the component is not a child of this coordinateLayout IllegalArgumentException is
-     * thrown.
+     * the component is not a child of this coordinateLayout
+     * IllegalArgumentException is thrown.
      * 
      * @param c1
@@ -451 +453 @@
          * @throws NumberFormatException
          */
-        public Coordinates(int top, int right, int bottom, int left, int width,
-                int height) throws IllegalArgumentException {
+        public Coordinates(int left, int top, int width, int height, int right,
+                int bottom) throws IllegalArgumentException {
 
             properties = new int[6];
             isUnitPercent = new boolean[6];
 
+            properties[LEFT] = left;
             properties[TOP] = top;
+            properties[WIDTH] = width;
+            properties[HEIGHT] = height;
             properties[RIGHT] = right;
             properties[BOTTOM] = bottom;
-            properties[LEFT] = left;
-
-            properties[WIDTH] = width;
-            properties[HEIGHT] = height;
 
             for (int i = 0; i < properties.length; i++) {
@@ -530 +531 @@
          * @param height
          */
-        public void setUnitsPercent(boolean top, boolean right, boolean bottom,
-                boolean left, boolean width, boolean height) {
+        public void setUnitsPercent(boolean left, boolean top, boolean width,
+                boolean height, boolean right, boolean bottom) {
             isUnitPercent[TOP] = top;
-            isUnitPercent[RIGHT] = right;
-            isUnitPercent[BOTTOM] = bottom;
             isUnitPercent[LEFT] = left;
             isUnitPercent[WIDTH] = width;
             isUnitPercent[HEIGHT] = height;
+            isUnitPercent[RIGHT] = right;
+            isUnitPercent[BOTTOM] = bottom;
         }
 

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

@@ -1 +1 @@
 package com.itmill.toolkit.ui.gwt.client;
 
-import com.google.gwt.user.client.ui.Widget;
 import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
+import com.itmill.toolkit.terminal.gwt.client.Paintable;
 import com.itmill.toolkit.terminal.gwt.client.UIDL;
 import com.itmill.toolkit.ui.gwt.client.ui.ICoordinateLayout;
@@ -9 +9 @@
 
     /** Creates a widget according to its class name. */
-    public Widget createWidget(UIDL uidl) {
+    public Paintable createWidget(UIDL uidl) {
         final String className = resolveWidgetTypeName(uidl);
         if ("com.itmill.toolkit.ui.gwt.client.ui.ICoordinateLayout"

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

@@ -211 +211 @@
 
                 Widget componentWidget = (Widget) componentIterator.next();
+                Caption componentCaption = (Caption) componentToCaption
+                        .get((Paintable) componentWidget);
 
                 // Reset position info
@@ -223 +225 @@
                 // (sides with a determined position)
                 boolean[] sidesToAttach = new boolean[6];
+                int numberOfSides = 0;
                 for (int i = 0; i < relative.length; i++) {
-                    sidesToAttach[i] = (relative[i] != -1);
+                    if (relative[i] != -1) {
+                        sidesToAttach[i] = true;
+                        ++numberOfSides;
+                    }
+                }
+                // At least one of (TOP, BOTTOM) must be attached to ensure the
+                // captions are displayed properly
+                if (!sidesToAttach[TOP] && !sidesToAttach[BOTTOM]) {
+                    sidesToAttach[TOP] = true;
                 }
 
@@ -327 +338 @@
 
                 // Update caption position
-                Caption c = (Caption) componentToCaption
-                        .get((Paintable) componentWidget);
-                if (c != null) {
-                    updateCaptionPosition(c, componentWidget);
+                if (componentCaption != null) {
+                    updateCaptionPosition(componentCaption, componentWidget);
 
                 }
@@ -354 +363 @@
         Element widgetElement = w.getElement();
         Element areaElement;
-
+        Caption componentCaption = (Caption) componentToCaption
+                .get((Paintable) w);
         // Set widget element attributes
         if (sidesToAttach[TOP] || sidesToAttach[HEIGHT]) {
-            DOM.setStyleAttribute(widgetElement, "top", "0px");
+            int margin = 0;
+            if (componentCaption != null) {
+                margin += componentCaption.getOffsetHeight();
+            }
+            DOM.setStyleAttribute(widgetElement, "top", Integer
+                    .toString(margin)
+                    + "px");
         }
         if (sidesToAttach[RIGHT] || sidesToAttach[WIDTH]) {
@@ -441 +457 @@
 
         int[] captionPosition = new int[6];
-        int parentTop, parentBottom, parentLeft, parentHeight;
+        int parentTop, parentRight, parentBottom, parentLeft, parentHeight, parentWidth;
+        String value;
 
         Element captionElement = c.getElement();
-
-        parentTop = parent.getAbsoluteTop();
-        parentHeight = parent.getOffsetHeight();
-        parentBottom = parentTop + parentHeight;
-        parentLeft = parent.getAbsoluteLeft();
-
-        captionPosition[TOP] = parentTop - c.getOffsetHeight();
-        captionPosition[RIGHT] = parentLeft + c.getOffsetWidth();
-        captionPosition[BOTTOM] = parentBottom + parentHeight;
-        captionPosition[LEFT] = parentLeft;
-        captionPosition[WIDTH] = c.getOffsetWidth();
-        captionPosition[HEIGHT] = c.getOffsetHeight();
-
-        // setWidgetPosition(c, cTop, cRight, cBottom, cLeft,
-        // c.getOffsetWidth(),
-        // c.getOffsetHeight());
-
+        Element parentElement = parent.getElement();
         Element areaElement = (Element) componentToArea.get(parent);
 
@@ -469 +470 @@
         }
 
-        DOM.setStyleAttribute(captionElement, "top", captionPosition[TOP]
-                + "px");
-        DOM.setStyleAttribute(captionElement, "right", captionPosition[RIGHT]
-                + "px");
-        DOM.setStyleAttribute(captionElement, "bottom", captionPosition[BOTTOM]
-                + "px");
-        DOM.setStyleAttribute(captionElement, "left", captionPosition[LEFT]
-                + "px");
-        DOM.setStyleAttribute(captionElement, "width", captionPosition[WIDTH]
-                + "px");
-        DOM.setStyleAttribute(captionElement, "height", captionPosition[HEIGHT]
-                + "px");
+        resetPositionAttributes((Widget) c);
+
+        parentTop = getPositionValue(parentElement, "top");
+        parentRight = getPositionValue(parentElement, "right");
+        parentBottom = getPositionValue(parentElement, "bottom");
+        parentLeft = getPositionValue(parentElement, "left");
+
+        if (parentBottom == -1 || parentTop != -1) {
+            DOM.setStyleAttribute(captionElement, "top", "0px");
+        } else {
+            int bottom = parent.getOffsetHeight();
+            DOM.setStyleAttribute(captionElement, "bottom", bottom + "px");
+        }
+
+        if (parentRight == -1 || parentLeft != -1) {
+            DOM.setStyleAttribute(captionElement, "left", "0px");
+        } else {
+            int right = parent.getOffsetWidth() - c.getOffsetWidth();
+            DOM.setStyleAttribute(captionElement, "right", right + "px");
+        }
+
+        // parentHeight = parent.getOffsetHeight();
+        // parentBottom = parentTop + parentHeight;
+        // parentLeft = parent.getAbsoluteLeft();
+
+        // captionPosition[TOP] = parentTop;
+        // captionPosition[RIGHT] = parentLeft + c.getOffsetWidth();
+        // captionPosition[BOTTOM] = parentBottom + parentHeight;
+        // captionPosition[LEFT] = parentLeft;
+        // captionPosition[WIDTH] = c.getOffsetWidth();
+        // captionPosition[HEIGHT] = c.getOffsetHeight();
+
+        // setWidgetPosition(c, cTop, cRight, cBottom, cLeft,
+        // c.getOffsetWidth(),
+        // c.getOffsetHeight());
+
+        // DOM.setStyleAttribute(captionElement, "right", captionPosition[RIGHT]
+        // + "px");
+        // DOM.setStyleAttribute(captionElement, "bottom",
+        // captionPosition[BOTTOM]
+        // + "px");
+        // DOM.setStyleAttribute(captionElement, "left", captionPosition[LEFT]
+        // + "px");
+        // DOM.setStyleAttribute(captionElement, "width", captionPosition[WIDTH]
+        // + "px");
+        // DOM.setStyleAttribute(captionElement, "height",
+        // captionPosition[HEIGHT]
+        // + "px");
 
         // force z update on caption
@@ -495 +532 @@
 
         // Set caption z-index (same as parent components z)
-        if (componentToCaption.get(component) != null) {
+        if (componentToCaption.get((Paintable) component) != null) {
             Caption c = (Caption) componentToCaption.get((Paintable) component);
             DOM.setStyleAttribute(c.getElement(), "zIndex", "" + zIndex);
@@ -645 +682 @@
     }
 
+    protected int getPositionValue(Element e, String position) {
+        String value = DOM.getStyleAttribute(e, position);
+        int intvalue = DOM.getElementPropertyInt(e, position);
+        if (!"".equals(value)) {
+            return Integer.parseInt(value.substring(0, value.length() - 2));
+        } else {
+            return -1;
+        }
+    }
+
     protected int calculateAbsoluteLeft(int width, int left, int right) {
 
@@ -725 +772 @@
     public void replaceChildComponent(Widget from, Widget to) {
         client.unregisterPaintable((Paintable) from);
-        final Caption c = (Caption) componentToCaption.get(from);
+        final Caption c = (Caption) componentToCaption.get((Paintable) from);
         if (c == null) {
             remove(from);