diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/WebChromeContainerSnippet.cpp
--- a/ginebra2/WebChromeContainerSnippet.cpp	Fri May 14 15:40:36 2010 +0300
+++ b/ginebra2/WebChromeContainerSnippet.cpp	Tue Jun 29 00:46:29 2010 -0400
@@ -1,22 +1,26 @@
 /*
 * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
 *
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
 *
-* Contributors:
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not,
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description: 
+* Description:
 *
 */
 
-
 #include "WebChromeContainerSnippet.h"
+#include "ChromeItem.h"
 #include "WebChromeItem.h"
 #include "ChromeWidget.h"
 #include "ChromeRenderer.h"
@@ -26,29 +30,33 @@
 
 namespace GVA {
 
-  WebChromeContainerSnippet::WebChromeContainerSnippet(const QString & elementId, ChromeWidget * chrome, const QRectF& ownerArea, const QWebElement & element, QGraphicsWidget* gwidget)
-    : ChromeSnippet(elementId, chrome, gwidget, element),
-      m_ownerArea(ownerArea),
-      m_layoutHeight(0)
+  WebChromeContainerSnippet::WebChromeContainerSnippet(const QString & elementId, ChromeWidget * chrome, const QWebElement & element)
+    : ChromeSnippet(elementId, chrome, 0, element)
+      ,m_layoutHeight(0)
   {
-    QGraphicsWidget * item = static_cast<QGraphicsWidget*> (widget());
+
+    m_layoutWidth = chrome->layout()->size().width();
+
+    //QGraphicsWidget * item = static_cast<QGraphicsWidget*> (widget());
     //NB: maybe size should be fixed only in one direction?
-    item->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); 
+    //item->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
     //NB: add a method for setting owner area
     //item->setPreferredSize(m_ownerArea.width(), m_ownerArea.height());
     //Also resize in case item is not part of anchor layout
     //item->resize(item->preferredSize());
- 
-   //NB: Linear layout efaults to horizontal: handle vertical layouts too.   
+
+   //NB: Linear layout efaults to horizontal: handle vertical layouts too.
     m_layout = new QGraphicsLinearLayout();
     m_layout->setContentsMargins(0,0,0,0);
     m_layout->setSpacing(0);
-    
+
     //Add a stretch element at the beginning.
     m_layout->addStretch();
-    item->setLayout(m_layout);
-    //When chrome is resized owner areas for snippets may change
+    //item->setLayout(m_layout);
+    //When chrome is resized sizes for snippets may change
     QObject::connect(m_chrome->renderer(), SIGNAL(chromeResized()), this, SLOT(updateOwnerArea()));
+    QObject::connect(m_chrome, SIGNAL(prepareForSizeChange(QSize)), this, SLOT(updateSize(QSize)));
+
   }
 
   WebChromeContainerSnippet::~WebChromeContainerSnippet()
@@ -60,7 +68,13 @@
   {
     ; //Do nothing since the layout positions children automatically.
   }
-
+  
+  void WebChromeContainerSnippet::setChromeWidget(QGraphicsWidget * widget){
+      widget->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+      widget->setLayout(m_layout);
+      ChromeSnippet::setChromeWidget(widget);
+  }
+  
   void WebChromeContainerSnippet::addChild(ChromeSnippet * child)
   {
     //Prevent layout from stretching the child widgets. NB: Revisit this to make configurable from chrome?
@@ -69,37 +83,58 @@
     m_layout->addItem(child->widget());
     //Add a stretch after each element so the layout looks like this: |stretch|item|stretch|item . . . . stretch|item|
     m_layout->addStretch();
-   
-    // If child is not a container itself, connect to its mouseEvent
-    WebChromeContainerSnippet * s = qobject_cast <WebChromeContainerSnippet * >(child);
-    if (!s ) {
-      //qDebug() << __PRETTY_FUNCTION__ << s  << child->elementId();
-      // Connect to mouse events of snippets
-      WebChromeItem * item = static_cast<WebChromeItem*> (child->widget());
-      connect(item, SIGNAL(mouseEvent(QEvent::Type)), this, SIGNAL(snippetMouseEvent(QEvent::Type)));
-    } 
+
     qreal childHeight = child->widget()->size().height();
-    if(childHeight > m_layoutHeight){
+    if (childHeight > m_layoutHeight){
       m_layoutHeight = childHeight;
-      updateOwnerArea();
+
+      updateSizes();
     }
+    emit childAdded(child);
+
+    m_layout->activate();
   }
 
   void WebChromeContainerSnippet:: updateOwnerArea()
   {
-    QGraphicsWidget * item = static_cast<QGraphicsWidget*> (widget());
-    //Resize the item
-    m_ownerArea =  m_chrome->getSnippetRect(m_elementId);
-    item->setPreferredSize(m_ownerArea.width(), m_layoutHeight);
-    //Also resize in case item is not part of anchor layout
-    item->resize(item->preferredSize());
+    updateSizes();
+    QObject::disconnect(m_chrome->renderer(), SIGNAL(chromeResized()), this, SLOT(updateOwnerArea()));
+
   }
 
   void WebChromeContainerSnippet::setLayoutHeight(int height){
-    if(m_layoutHeight != height){
+    if (m_layoutHeight != height){
       m_layoutHeight = height;
-      updateOwnerArea();
+      updateSizes();
+    }
+  }
+
+  void WebChromeContainerSnippet::setLayoutWidth(qreal width, bool update){
+    if (m_layoutWidth != width){
+      m_layoutWidth = width;
+      if (update ) {
+        updateSizes();
+      }
     }
   }
 
+  void WebChromeContainerSnippet::updateSize(QSize size ) {
+
+    Q_UNUSED(size);
+    // m_layoutWidth should have been set by now through derived classes. We don't want to set it
+    // here as that would overwrite any width set before. For example, width of the middle snippet
+    // in toolbar is set by the main toolbar.
+    updateSizes();
+  }
+
+  void WebChromeContainerSnippet::updateSizes() {
+      
+    QGraphicsWidget * item = static_cast<QGraphicsWidget*> (widget());
+    //Resize the item
+    item->setPreferredSize(m_layoutWidth, m_layoutHeight);
+    //Also resize in case item is not part of anchor layout
+    item->resize(item->preferredSize());
+
+  }
+
 } // endof namespace GVA