From 4d1d33022a431c3108c4eb33a60d23b0f013d9b8 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 11 Apr 2014 15:12:26 +0200 Subject: Fix how NewPopupDisposition is exposed in QQuickWebEngineView I initially misintepreted the meaning of the enum, assuming that it meant that the window should possibly be blocked. The user_gesture parameter in WebContentsDelegate::AddNewContents is actually doing this, while the popup disposition means that JavaScript requested the window to be opened without one of the standard decoration (i.e. status bar, menu bar, tool bar, etc.). Update the QtQuick API to reflect this, renaming the "isPopup" parameter to a more familiar "isUserInitiated". The popup disposition is named "dialog" to match the previous QWebPage::WebModalDialog enum. Change-Id: Ib0c4bc53671fcf0dd9499aa1be2bbc8c494ba49e Reviewed-by: Michael Bruning --- src/webengine/api/qquickwebenginenewviewrequest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/webengine/api/qquickwebenginenewviewrequest.cpp') diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp index 8af8f5b49..2aa45228c 100644 --- a/src/webengine/api/qquickwebenginenewviewrequest.cpp +++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp @@ -57,9 +57,9 @@ QQuickWebEngineView::NewViewDestination QQuickWebEngineNewViewRequest::destinati return m_destination; } -bool QQuickWebEngineNewViewRequest::isPopup() const +bool QQuickWebEngineNewViewRequest::isUserInitiated() const { - return m_isPopup; + return m_isUserInitiated; } void QQuickWebEngineNewViewRequest::openIn(QQuickWebEngineView *view) -- cgit v1.2.3