Changeset 4943

Timestamp:

06/24/08 08:51:41 (5 months ago)

Author:

matti.tahvonen@…

Message:

fixes #1743 (natural height horizontal expand layout)

Location:

trunk/src/com/itmill/toolkit

Files:

• terminal/gwt/client/ui/IExpandLayout.java (modified) (1 diff)
• tests/TestForExpandLayout.java (modified) (2 diffs)

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

@@ -353 +353 @@
     public void iLayout() {
         if (orientationMode == ORIENTATION_HORIZONTAL) {
-            int pixels = getOffsetHeight() - getTopMargin() - getBottomMargin();
-            if (pixels < 0) {
-                pixels = 0;
+            int pixels;
+            if ("".equals(height)) {
+                // try to find minimum height by looping all widgets
+                int maxHeight = 0;
+                Iterator iterator = getPaintables().iterator();
+                while (iterator.hasNext()) {
+                    Widget w = (Widget) iterator.next();
+                    int h = w.getOffsetHeight();
+                    if (h > maxHeight) {
+                        maxHeight = h;
+                    }
+                }
+                pixels = maxHeight;
+            } else {
+                pixels = getOffsetHeight() - getTopMargin() - getBottomMargin();
+                if (pixels < 0) {
+                    pixels = 0;
+                }
             }
             DOM.setStyleAttribute(marginElement, "height", pixels + "px");

trunk/src/com/itmill/toolkit/tests/TestForExpandLayout.java

@@ -10 +10 @@
 import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.Panel;
 
 /**
@@ -28 +29 @@
     public void createNewView() {
         main.removeAllComponents();
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 6; i++) {
             final ExpandLayout el = new ExpandLayout(
                     OrderedLayout.ORIENTATION_HORIZONTAL);
-            for (int j = 0; j < 10; j++) {
+            for (int j = 0; j < i + 3; j++) {
                 final Label l = new Label("label" + i + ":" + j);
                 el.addComponent(l);
             }
             if (i > 0) {
-                el.setHeight(1, ExpandLayout.UNITS_EM);
+                // el.setMargin(true);
+                el.setSizeUndefined();
+                el.setWidth("100%");
+                if (i % 2 == 0) {
+                    el.setHeight("8em");
+                    Panel p = new Panel("tp");
+                    p.addComponent(new Label("panelc"));
+                    p.setHeight("100%");
+                    p.setWidth("100px");
+                    el.addComponent(p);
+                }
             }
             main.addComponent(el);