Changeset 5215

Timestamp:

08/19/08 12:13:04 (5 months ago)

Author:

risto.yrjana@…

Message:

Fixed width and height with borders

Location:

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

Files:

• tests/tickets/Ticket1267.java (modified) (6 diffs)
• ui/gwt/client/ui/ICoordinateLayout.java (modified) (4 diffs)

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

@@ -11 +11 @@
 import com.itmill.toolkit.ui.CoordinateLayout;
 import com.itmill.toolkit.ui.DateField;
+import com.itmill.toolkit.ui.ExpandLayout;
 import com.itmill.toolkit.ui.GridLayout;
 import com.itmill.toolkit.ui.Label;
@@ -16 +17 @@
 import com.itmill.toolkit.ui.Panel;
 import com.itmill.toolkit.ui.Slider;
-import com.itmill.toolkit.ui.SplitPanel;
 import com.itmill.toolkit.ui.Table;
 import com.itmill.toolkit.ui.TextField;
@@ -29 +29 @@
         final Window main = new Window("Coordinatelayout demo");
 
-        SplitPanel sPanel = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
+        // SplitPanel sPanel = new
+        // SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
 
         layout.setBorders(true);
@@ -62 +63 @@
         table.setSizeFull();
         layout.setCoordinates(table, new CoordinateLayout.Coordinates(
-                "0,0,-1,-1,30%,50%"));
+                "0,0,0,0,-1,-1"));
 
         CoordinateLayout.Coordinates xy = new CoordinateLayout.Coordinates(40,
@@ -75 +76 @@
 
         final Panel panel = new Panel("TestPanel");
-        layout.addComponent(panel, "15%,-1,-1,0,-1,-1%");
+        layout.addComponent(panel, "-1,0,0%,-1,-1,-1%");
 
         Button b1 = new Button("Add contents to panel");
@@ -133 +134 @@
         right.addComponent(b5);
 
-        sPanel.addComponent(layout);
-        sPanel.addComponent(right);
-
-        sPanel.setSplitPosition(75);
-
-        main.setLayout(sPanel);
-
-        // ExpandLayout mainLayout = new ExpandLayout(
-        // ExpandLayout.ORIENTATION_HORIZONTAL);
-        // mainLayout.addComponent(layout);
-        // mainLayout.addComponent(right);
-        // main.setLayout(mainLayout);
+        // sPanel.addComponent(layout);
+        // sPanel.addComponent(right);
+        //
+        // sPanel.setSplitPosition(75);
+        //
+        // main.setLayout(sPanel);
+
+        ExpandLayout mainLayout = new ExpandLayout(
+                ExpandLayout.ORIENTATION_HORIZONTAL);
+        mainLayout.addComponent(layout);
+        mainLayout.addComponent(right);
+        main.setLayout(mainLayout);
 
         setMainWindow(main);

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

@@ -213 +213 @@
                             .getPaintable(componentDataUIDL);
                     Widget componentWidget = (Widget) componentDataPaintable;
+                    Element componentElement = componentWidget.getElement();
+                    int[] absolute = new int[6];
 
                     // Reset position info
-                    removePositionAttributes(componentWidget.getElement());
-                    DOM.setStyleAttribute(componentWidget.getElement(),
-                            "position", "absolute");
-
-                    // Here we real calculate values from (possibly) percentage
+                    removePositionAttributes(componentElement);
+                    DOM.setStyleAttribute(componentElement, "position",
+                            "absolute");
+
+                    // Calculate real pixel values from (possibly) percentage
                     // values
                     int top = calculateRealCoord("top", coords, isValuePercent);
@@ -229 +231 @@
                             isValuePercent);
 
-                    // If we are not given a width and height we should first
-                    // try to
-                    // calculate them from the coordinates. If that fails, we
-                    // should
-                    // query the widget. In the simplest case they are given in
-                    // from
-                    // the
-                    // server.
-
-                    int width = -1;
-                    int height = -1;
+                    // Try to calculate width and height from the given
+                    // values and ask the component only if necessary
+
+                    absolute[WIDTH] = -1;
+                    absolute[HEIGHT] = -1;
 
                     if (dimensions.getIntAttribute("width") == -1) {
                         if (left != -1 & right != -1) {
-                            width = layout[RIGHT] - left - right;
+                            absolute[WIDTH] = layout[RIGHT] - left - right;
                         } else {
-
-                            width = componentWidget.getOffsetWidth();
+                            absolute[WIDTH] = componentWidget.getOffsetWidth();
                         }
                     } else {
-                        width = dimensions.getIntAttribute("width");
+                        absolute[WIDTH] = dimensions.getIntAttribute("width");
                         if (isValuePercent.getBooleanAttribute("width")) {
-                            float multiplier = (float) width / 100;
-                            width = (int) (multiplier * this.getOffsetWidth());
+                            float multiplier = (float) absolute[WIDTH] / 100;
+                            absolute[WIDTH] = (int) (multiplier * this
+                                    .getOffsetWidth());
                         }
                     }
@@ -258 +254 @@
                     if (dimensions.getIntAttribute("height") == -1) {
                         if (top != -1 & bottom != -1) {
-                            height = layout[BOTTOM] - top - bottom;
-
+                            absolute[HEIGHT] = layout[BOTTOM] - top - bottom;
                         } else {
-
-                            height = componentWidget.getOffsetHeight();
+                            absolute[HEIGHT] = componentWidget
+                                    .getOffsetHeight();
 
                         }
                     } else {
-                        height = dimensions.getIntAttribute("height");
+                        absolute[HEIGHT] = dimensions.getIntAttribute("height");
                         if (isValuePercent.getBooleanAttribute("height")) {
-                            float multiplier = (float) height / 100;
-                            height = (int) (multiplier * this.getOffsetHeight());
+                            float multiplier = (float) absolute[HEIGHT] / 100;
+                            absolute[HEIGHT] = (int) (multiplier * this
+                                    .getOffsetHeight());
                         }
 
                     }
 
-                    // Next we calculate the coordinates for the component
+                    // Calculate the coordinates for the component
                     // Each coordinate needs component size and two related
                     // coordinates
-                    int absoluteTop = calculateAbsoluteTop(height, top, bottom);
-                    int absoluteRight = calculateAbsoluteRight(width, right,
-                            left);
-                    int absoluteBottom = calculateAbsoluteBottom(height,
-                            bottom, top);
-                    int absoluteLeft = calculateAbsoluteLeft(width, left, right);
+
+                    absolute[TOP] = calculateAbsoluteTop(absolute[HEIGHT], top,
+                            bottom);
+                    absolute[RIGHT] = calculateAbsoluteRight(absolute[WIDTH],
+                            right, left);
+                    absolute[BOTTOM] = calculateAbsoluteBottom(
+                            absolute[HEIGHT], bottom, top);
+                    absolute[LEFT] = calculateAbsoluteLeft(absolute[WIDTH],
+                            left, right);
 
                     // Sanity checks
-                    // height
-                    if ((absoluteTop + absoluteBottom) > getOffsetHeight()) {
-                        if (absoluteTop > absoluteBottom) {
-                            absoluteTop -= absoluteTop - absoluteBottom;
+                    // negative values
+                    for (int i = 0; i < absolute.length; i++) {
+                        if (absolute[i] < 0) {
+                            absolute[i] = 0;
+                        }
+                    }
+
+                    // height overflows
+                    if ((absolute[TOP] + absolute[BOTTOM]) > getOffsetHeight()) {
+                        if (absolute[TOP] > absolute[BOTTOM]) {
+                            absolute[TOP] -= absolute[TOP] - absolute[BOTTOM];
                         } else {
-                            absoluteBottom -= absoluteBottom - absoluteTop;
+                            absolute[BOTTOM] -= absolute[BOTTOM]
+                                    - absolute[TOP];
                         }
                     }
 
-                    if (height > getOffsetHeight()) {
-                        height = getOffsetHeight();
-                    } else if (height < 0) {
-                        height = 0;
-                    }
-
-                    // width
-                    if (absoluteRight + absoluteLeft > getOffsetWidth()) {
-                        if (absoluteRight > absoluteLeft) {
-                            absoluteRight -= absoluteRight - absoluteLeft;
+                    if (absolute[HEIGHT] > getOffsetHeight()) {
+                        absolute[HEIGHT] = getOffsetHeight();
+                    }
+
+                    // width overflows
+                    if (absolute[RIGHT] + absolute[LEFT] > getOffsetWidth()) {
+                        if (absolute[RIGHT] > absolute[LEFT]) {
+                            absolute[RIGHT] -= absolute[RIGHT] - absolute[LEFT];
                         } else {
-                            absoluteLeft -= absoluteLeft - absoluteRight;
+                            absolute[LEFT] -= absolute[LEFT] - absolute[RIGHT];
                         }
                     }
 
-                    if (width > getOffsetWidth()) {
-                        width = getOffsetWidth();
-                    } else if (width < 0) {
-                        width = 0;
-                    }
+                    if (absolute[WIDTH] > getOffsetWidth()) {
+                        absolute[WIDTH] = getOffsetWidth();
+                    }
+
+                    // this is a fix for borders
+                    // TODO there might be a better way to do this
+                    int border = (DOM.getElementPropertyInt(componentElement,
+                            "offsetWidth") - DOM.getElementPropertyInt(
+                            componentElement, "clientWidth"));
+
+                    absolute[WIDTH] -= border;
+                    absolute[HEIGHT] -= border;
 
                     System.err.print("For component "
@@ -322 +334 @@
                     System.err.print(coords.getIntAttribute("left") + ",");
                     System.err.print(dimensions.getIntAttribute("width") + ",");
-                    System.err.print(dimensions.getIntAttribute("height")
+                    System.err.print(dimensions
+                            .getIntAttribute("absolute[HEIGHT]")
                             + "), ");
 
                     System.err.print("calculated (" + top + "," + right + ","
                             + bottom + "," + left + "), ");
-                    System.err
-                            .print("absolute (" + absoluteTop + ","
-                                    + absoluteRight + "," + absoluteBottom
-                                    + "," + absoluteLeft + "," + width + ","
-                                    + height + ")\n");
+                    System.err.print("absolute (" + absolute[TOP] + ","
+                            + absolute[RIGHT] + "," + absolute[BOTTOM] + ","
+                            + absolute[LEFT] + "," + absolute[WIDTH] + ","
+                            + absolute[HEIGHT] + ")\n");
 
                     // this call puts the component to the componentToCoords map
                     // and sets the style attributes
-                    setWidgetPosition(componentWidget, absoluteTop,
-                            absoluteRight, absoluteBottom, absoluteLeft, width,
-                            height);
+                    setWidgetPosition(componentWidget, absolute[TOP],
+                            absolute[RIGHT], absolute[BOTTOM], absolute[LEFT],
+                            absolute[WIDTH], absolute[HEIGHT]);
 
                     // Update caption position