diff options
| author | Jarred Nicholls <jarred.nicholls@gmail.com> | 2014-10-20 10:40:19 -0400 |
|---|---|---|
| committer | Jarred Nicholls <jarred.nicholls@gmail.com> | 2014-10-21 16:05:07 +0200 |
| commit | a5a680f93ddd2488c8eb494a17ff18a0932e8cec (patch) | |
| tree | 3f51ae6ad318719de4e2cbcfb656a4597238859e | |
| parent | 4c19349e2ddd74995e045e91cd62cbc2130cde0c (diff) | |
| download | qtwebengine-a5a680f93ddd2488c8eb494a17ff18a0932e8cec.tar.gz | |
Distinguish between tab dispositions in NewViewRequest Quick API.
A tab's disposition can be foreground (e.g. target="_blank") or background
(Ctrl+Click, or middle-click). API consumers should be able to discern between
the two intents, so they can decide whether or not to focus their new view.
Change-Id: Iab3ccb9e9f0b85256892f4f74204515bdeefa695
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 6 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 3 | ||||
| -rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 6f216fda9..e3ec66352 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -341,9 +341,11 @@ void QQuickWebEngineViewPrivate::adoptNewWindow(WebContentsAdapter *newWebConten switch (disposition) { case WebContentsAdapterClient::NewForegroundTabDisposition: - case WebContentsAdapterClient::NewBackgroundTabDisposition: request.m_destination = QQuickWebEngineView::NewViewInTab; break; + case WebContentsAdapterClient::NewBackgroundTabDisposition: + request.m_destination = QQuickWebEngineView::NewViewInBackgroundTab; + break; case WebContentsAdapterClient::NewPopupDisposition: request.m_destination = QQuickWebEngineView::NewViewInDialog; break; @@ -354,7 +356,7 @@ void QQuickWebEngineViewPrivate::adoptNewWindow(WebContentsAdapter *newWebConten Q_UNREACHABLE(); } - emit e->newViewRequested(&request); + Q_EMIT e->newViewRequested(&request); } void QQuickWebEngineViewPrivate::close() diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index d2f262a9b..e2871a79e 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -118,7 +118,8 @@ public: enum NewViewDestination { NewViewInWindow, NewViewInTab, - NewViewInDialog + NewViewInDialog, + NewViewInBackgroundTab }; // must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index f7cffb8b1..abb8d3d7b 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -90,6 +90,7 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.NewViewInWindow --> NewViewDestination" << "QQuickWebEngineView.NewViewInTab --> NewViewDestination" << "QQuickWebEngineView.NewViewInDialog --> NewViewDestination" + << "QQuickWebEngineView.NewViewInBackgroundTab --> NewViewDestination" << "QQuickWebEngineView.InfoMessageLevel --> JavaScriptConsoleMessageLevel" << "QQuickWebEngineView.WarningMessageLevel --> JavaScriptConsoleMessageLevel" << "QQuickWebEngineView.ErrorMessageLevel --> JavaScriptConsoleMessageLevel" |