From bb7b759968eeeb5830ba7a70a75b64829d1c6754 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Tue, 6 Oct 2009 10:01:37 +0000
Subject: [PATCH] Merged: [9096] fix for #3444 Opera missing components and
 [9097] CellBasedLayout style typo

svn changeset:9099/svn branch:6.2
---
 .../gwt/client/ui/VOrderedLayout.java         |  4 ++--
 .../gwt/client/ui/layout/CellBasedLayout.java |  4 +++-
 .../ui/layout/ChildComponentContainer.java    | 19 ++++++++++---------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java
index b37c6abde6..282136383d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java
@@ -117,7 +117,7 @@ public class VOrderedLayout extends CellBasedLayout {
                 relativeSizeComponentUIDL.add(childUIDL);
             } else {
                 if (isDynamicWidth()) {
-                    childComponentContainer.renderChild(childUIDL, client, 0);
+                    childComponentContainer.renderChild(childUIDL, client, -1);
                 } else {
                     childComponentContainer.renderChild(childUIDL, client,
                             activeLayoutSize.getWidth());
@@ -166,7 +166,7 @@ public class VOrderedLayout extends CellBasedLayout {
             UIDL childUIDL = relativeSizeComponentUIDL.get(i);
 
             if (isDynamicWidth()) {
-                childComponentContainer.renderChild(childUIDL, client, 0);
+                childComponentContainer.renderChild(childUIDL, client, -1);
             } else {
                 childComponentContainer.renderChild(childUIDL, client,
                         activeLayoutSize.getWidth());
diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
index 1d4ed5b0f9..5700c7b5e0 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
@@ -238,7 +238,9 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container
         helper = Document.get().createDivElement();
         helper
                 .setInnerHTML("<div style=\"position:absolute;top:0;left:0;height:0;visibility:hidden;overflow:hidden;\">"
-                        + "<div style=\"width:0;height:0;visibility:hidden;overflow;hidden;\"></div></div><div style=\"position:absolute;height:0;overflow:hidden;\"></div>");
+                        + "<div style=\"width:0;height:0;visibility:hidden;overflow:hidden;\">"
+                        + "</div></div>"
+                        + "<div style=\"position:absolute;height:0;overflow:hidden;\"></div>");
         NodeList<Node> childNodes = helper.getChildNodes();
         measurement = (DivElement) childNodes.getItem(0);
         measurement2 = (DivElement) measurement.getFirstChildElement();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java b/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
index 53065caf9f..ccda36ff8e 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
@@ -40,7 +40,7 @@ public class ChildComponentContainer extends Panel {
     private int captionHeight = 0;
 
     /**
-     * 
+     *
      * Padding added to the container when it is larger than the component.
      */
     private Size containerExpansion = new Size(0, 0);
@@ -189,19 +189,20 @@ public class ChildComponentContainer extends Panel {
         /*
          * Must remove width specification from container before rendering to
          * allow components to grow in horizontal direction.
-         * 
+         *
          * For fixed width layouts we specify the width directly so that height
          * is automatically calculated correctly (e.g. for Labels).
          */
         /*
          * This should no longer be needed (after #2563) as all components are
          * such that they can be rendered inside a 0x0 DIV.
+         *
+         * The exception seems to be complex components (Tree and Table) on
+         * Opera (#3444).
          */
-        // if (fixedWidth > 0) {
-        // setLimitedContainerWidth(fixedWidth);
-        // } else {
-        // setUnlimitedContainerWidth();
-        // }
+        if (fixedWidth < 0 && BrowserInfo.get().isOpera()) {
+            setUnlimitedContainerWidth();
+        }
         ((Paintable) widget).updateFromUIDL(childUIDL, client);
     }
 
@@ -610,7 +611,7 @@ public class ChildComponentContainer extends Panel {
     /**
      * Return true if the size of the widget has been specified in the selected
      * orientation.
-     * 
+     *
      * @return
      */
     public boolean widgetHasSizeSpecified(int orientation) {
@@ -653,7 +654,7 @@ public class ChildComponentContainer extends Panel {
     /**
      * Sets the normalized expand ratio of this slot. The fraction that this
      * slot will use of "excess space".
-     * 
+     *
      * @param expandRatio
      */
     public void setNormalizedExpandRatio(double expandRatio) {
-- 
2.39.5