Changeset 5095

Timestamp:

07/11/08 14:57:54 (3 months ago)

Author:

joonas.lehtinen@…

Message:

Fixes #1938 Changing OrderedLayout? vertical from undefined width to pixelwidth does not properly cut the width of children

Files:

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

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

@@ -462 +462 @@
     /** Recalculate and apply child widths */
     private void updateChildWidths() {
-        // Horizontal layout is calculated by us
-        if (width != null && orientationMode == ORIENTATION_HORIZONTAL) {
+        // layout is calculated by us
+        if (width != null) {
 
             // Calculate the space for fixed contents minus marginals
@@ -494 +494 @@
             // Reduce spacing from the size
             int numChild = childWidgets.size();
-            if (hasComponentSpacing) {
+            if (hasComponentSpacing
+                    && orientationMode == ORIENTATION_HORIZONTAL) {
                 size -= hSpacing * (numChild - 1);
             }
@@ -512 +513 @@
         }
 
-        // Horizontal layout is calculated by the browsers
+        // Layout is calculated by the browsers
         else {
             for (Iterator i = childWidgetWrappers.iterator(); i.hasNext();) {