Changeset 5059

Timestamp:

07/04/08 09:52:12 (6 months ago)

Author:

joonas.lehtinen@…

Message:

Added stubs for using CSS reader for #1904

Files:

• trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java (modified) (11 diffs)

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java

@@ -39 +39 @@
     public static final int ORIENTATION_HORIZONTAL = 1;
 
-    // TODO Read these from CSS as in #1904
-    private static final int HSPACING = 8;
-    private static final int VSPACING = 8;
-    private static final int MARGIN_TOP = 15;
-    private static final int MARGIN_BOTTOM = 15;
-    private static final int MARGIN_LEFT = 18;
-    private static final int MARGIN_RIGHT = 18;
+    private int hSpacing = -1;
+    private int vSpacing = -1;
+    private int marginTop = -1;
+    private int marginBottom = -1;
+    private int marginLeft = -1;
+    private int marginRight = -1;
 
     int orientationMode = ORIENTATION_VERTICAL;
@@ -207 +206 @@
         // Only non-cached UIDL:s can introduce changes
         if (!uidl.getBooleanAttribute("cached")) {
+
+            updateMarginAndSpacingSizesFromCSS(uidl);
 
             // Swith between orientation modes if necessary
@@ -318 +319 @@
     }
 
+    private void updateMarginAndSpacingSizesFromCSS(UIDL uidl) {
+        // TODO Read spacing and margins from CSS as documented in #1904.
+        // Somehow refresh after updates
+
+        hSpacing = 8;
+        vSpacing = 8;
+        marginTop = 15;
+        marginBottom = 15;
+        marginLeft = 18;
+        marginRight = 18;
+    }
+
     /**
      * While setting width, ensure that margin div is also resized properly.
@@ -335 +348 @@
             // Calculate margin pixel width
             int cw = DOM.getElementPropertyInt(root, "offsetWidth");
-            cw -= margins.hasLeft() ? MARGIN_LEFT : 0;
-            cw -= margins.hasRight() ? MARGIN_RIGHT : 0;
+            cw -= margins.hasLeft() ? marginLeft : 0;
+            cw -= margins.hasRight() ? marginRight : 0;
             DOM.setStyleAttribute(margin, "width", cw + "px");
 
@@ -366 +379 @@
             // Calculate margin pixel height
             int ch = DOM.getElementPropertyInt(root, "offsetHeight");
-            ch -= margins.hasTop() ? MARGIN_TOP : 0;
-            ch -= margins.hasBottom() ? MARGIN_BOTTOM : 0;
+            ch -= margins.hasTop() ? marginTop : 0;
+            ch -= margins.hasBottom() ? marginBottom : 0;
             DOM.setStyleAttribute(margin, "height", ch + "px");
 
@@ -427 +440 @@
                         : "offsetHeight");
         if (orientationMode == ORIENTATION_HORIZONTAL) {
-            size -= margins.hasLeft() ? MARGIN_LEFT : 0;
-            size -= margins.hasRight() ? MARGIN_RIGHT : 0;
+            size -= margins.hasLeft() ? marginLeft : 0;
+            size -= margins.hasRight() ? marginRight : 0;
         } else {
-            size -= margins.hasTop() ? MARGIN_TOP : 0;
-            size -= margins.hasBottom() ? MARGIN_BOTTOM : 0;
+            size -= margins.hasTop() ? marginTop : 0;
+            size -= margins.hasBottom() ? marginBottom : 0;
         }
 
@@ -444 +457 @@
         int numChild = childWidgets.size();
         if (hasComponentSpacing) {
-            size -= ((orientationMode == ORIENTATION_HORIZONTAL) ? HSPACING
-                    : VSPACING)
+            size -= ((orientationMode == ORIENTATION_HORIZONTAL) ? hSpacing
+                    : vSpacing)
                     * (numChild - 1);
         }
@@ -489 +502 @@
         // Update margin classes
         DOM.setStyleAttribute(margin, "paddingTop",
-                margins.hasTop() ? MARGIN_TOP + "px" : "0");
+                margins.hasTop() ? marginTop + "px" : "0");
         DOM.setStyleAttribute(margin, "paddingLeft",
-                margins.hasLeft() ? MARGIN_LEFT + "px" : "0");
+                margins.hasLeft() ? marginLeft + "px" : "0");
         DOM.setStyleAttribute(margin, "paddingBottom",
-                margins.hasBottom() ? MARGIN_BOTTOM + "px" : "0");
+                margins.hasBottom() ? marginBottom + "px" : "0");
         DOM.setStyleAttribute(margin, "paddingRight",
-                margins.hasRight() ? MARGIN_RIGHT + "px" : "0");
+                margins.hasRight() ? marginRight + "px" : "0");
 
         // Update calculated height if needed
@@ -501 +514 @@
         if (currentMarginHeight != null && !"".equals(currentMarginHeight)) {
             int ch = DOM.getElementPropertyInt(root, "offsetHeight");
-            ch -= margins.hasTop() ? MARGIN_TOP : 0;
-            ch -= margins.hasBottom() ? MARGIN_BOTTOM : 0;
+            ch -= margins.hasTop() ? marginTop : 0;
+            ch -= margins.hasBottom() ? marginBottom : 0;
             DOM.setStyleAttribute(margin, "height", ch + "px");
         }
@@ -508 +521 @@
         if (currentMarginWidth != null && !"".equals(currentMarginWidth)) {
             int cw = DOM.getElementPropertyInt(root, "offsetWidth");
-            cw -= margins.hasLeft() ? MARGIN_LEFT : 0;
-            cw -= margins.hasRight() ? MARGIN_RIGHT : 0;
+            cw -= margins.hasLeft() ? marginLeft : 0;
+            cw -= margins.hasRight() ? marginRight : 0;
             DOM.setStyleAttribute(margin, "width", cw + "px");
         }
@@ -751 +764 @@
                     orientationMode == ORIENTATION_HORIZONTAL ? "paddingLeft"
                             : "marginTop",
-                    b ? (orientationMode == ORIENTATION_HORIZONTAL ? HSPACING
-                            : VSPACING)
+                    b ? (orientationMode == ORIENTATION_HORIZONTAL ? hSpacing
+                            : vSpacing)
                             + "px" : "0");
         }