--- a/ginebra2/WebChromeSnippet.cpp Fri May 14 15:40:36 2010 +0300
+++ b/ginebra2/WebChromeSnippet.cpp Wed Jun 23 17:59:43 2010 +0300
@@ -1,21 +1,24 @@
/*
* 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 "WebChromeSnippet.h"
#include "WebChromeItem.h"
#include "PopupWebChromeItem.h"
@@ -35,7 +38,8 @@
QString type = element.attribute("data-GinebraItemType", "normal");
if (type == "popup") {
- return new PopupWebChromeItem(ownerArea, chrome, element);
+ QString modal = element.attribute("data-GinebraPopupModal", "true");
+ return new PopupWebChromeItem(ownerArea, chrome, element, 0, modal == "true");
}
return new WebChromeItem(ownerArea, chrome, element);
@@ -56,7 +60,7 @@
WebChromeSnippet::~WebChromeSnippet()
{
}
-
+
WebChromeItem * WebChromeSnippet::item()
{
return static_cast<WebChromeItem*> (widget());
@@ -67,16 +71,18 @@
//qDebug() << "WebChromeSnippet::grabFocus";
WebChromeItem * item = static_cast<WebChromeItem*> (widget());
item->grabFocus();
- }
+ }
void WebChromeSnippet:: updateOwnerArea()
{
+
WebChromeItem * item = static_cast<WebChromeItem*> (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()));
+
}
} // endof namespace GVA