diff -r 0f2326c2a325 -r 1c3b8676e58c ginebra2/WebChromeSnippet.cpp --- a/ginebra2/WebChromeSnippet.cpp Wed Jun 23 17:59:43 2010 +0300 +++ b/ginebra2/WebChromeSnippet.cpp Tue Jul 06 14:03:49 2010 +0300 @@ -32,25 +32,23 @@ static WebChromeItem * newChromeItem( ChromeWidget * chrome, - const QRectF& ownerArea, const QWebElement & element) { QString type = element.attribute("data-GinebraItemType", "normal"); if (type == "popup") { QString modal = element.attribute("data-GinebraPopupModal", "true"); - return new PopupWebChromeItem(ownerArea, chrome, element, 0, modal == "true"); + return new PopupWebChromeItem(chrome, element, 0, modal == "true"); } - return new WebChromeItem(ownerArea, chrome, element); + return new WebChromeItem(chrome, element); } WebChromeSnippet::WebChromeSnippet( const QString & elementId, ChromeWidget * chrome, - const QRectF& ownerArea, const QWebElement & element) - : ChromeSnippet(elementId, chrome, newChromeItem(chrome, ownerArea, element), element) + : ChromeSnippet(elementId, chrome, newChromeItem(chrome, element), element) { WebChromeItem * item = static_cast (widget()); @@ -77,11 +75,9 @@ { WebChromeItem * item = static_cast (widget()); - //Setting owner area also resets the item's size and preferred size - item->setOwnerArea(m_chrome->getSnippetRect(m_elementId)); - //qDebug() << WebChromeSnippet::updateOwnerArea: id: " << m_elementId << " element rect: " << item->ownerArea(); - //NB: Should move this to WebChromeItem::setOwnerArea()? - item->setCachedHandlers(m_chrome->dom()->getCachedHandlers(m_elementId, item->ownerArea())); + item->updateSizes(); + //TODO: Revisit this, don't use owner area + //item->setCachedHandlers(m_chrome->dom()->getCachedHandlers(m_elementId, item->ownerArea())); }