diff options
| -rw-r--r-- | examples/webenginewidgets/demobrowser/webview.cpp | 3 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 13 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 4 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 3 |
4 files changed, 21 insertions, 2 deletions
diff --git a/examples/webenginewidgets/demobrowser/webview.cpp b/examples/webenginewidgets/demobrowser/webview.cpp index ed7f52ad0..35f765b5c 100644 --- a/examples/webenginewidgets/demobrowser/webview.cpp +++ b/examples/webenginewidgets/demobrowser/webview.cpp @@ -185,6 +185,8 @@ QWebEnginePage *WebPage::createWindow(QWebEnginePage::WebWindowType type) { if (type == QWebEnginePage::WebBrowserTab) { return mainWindow()->tabWidget()->newTab()->page(); + } else if (type == QWebEnginePage::WebBrowserBackgroundTab) { + return mainWindow()->tabWidget()->newTab(false)->page(); } else if (type == QWebEnginePage::WebBrowserWindow) { BrowserApplication::instance()->newMainWindow(); BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow(); @@ -387,6 +389,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) ++it; menu->insertAction(*it, page()->action(QWebEnginePage::OpenLinkInNewWindow)); menu->insertAction(*it, page()->action(QWebEnginePage::OpenLinkInNewTab)); + menu->insertAction(*it, page()->action(QWebEnginePage::OpenLinkInNewBackgroundTab)); } menu->popup(event->globalPos()); diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 2b448664f..18e592f0d 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -90,8 +90,9 @@ static QWebEnginePage::WebWindowType toWindowType(WebContentsAdapterClient::Wind { switch (disposition) { case WebContentsAdapterClient::NewForegroundTabDisposition: - case WebContentsAdapterClient::NewBackgroundTabDisposition: return QWebEnginePage::WebBrowserTab; + case WebContentsAdapterClient::NewBackgroundTabDisposition: + return QWebEnginePage::WebBrowserBackgroundTab; case WebContentsAdapterClient::NewPopupDisposition: return QWebEnginePage::WebDialog; case WebContentsAdapterClient::NewWindowDisposition: @@ -801,6 +802,9 @@ QAction *QWebEnginePage::action(WebAction action) const case OpenLinkInNewTab: text = tr("Open Link in New Tab"); break; + case OpenLinkInNewBackgroundTab: + text = tr("Open Link in New Background Tab"); + break; case CopyLinkToClipboard: text = tr("Copy Link URL"); break; @@ -932,6 +936,13 @@ void QWebEnginePage::triggerAction(WebAction action, bool) newPage->setUrl(d->m_menuData.linkUrl); } break; + case OpenLinkInNewBackgroundTab: + if (d->m_menuData.linkUrl.isValid()) { + QWebEnginePage *newPage = createWindow(WebBrowserBackgroundTab); + if (newPage) + newPage->setUrl(d->m_menuData.linkUrl); + } + break; case CopyLinkToClipboard: if (d->m_menuData.linkUrl.isValid()) { QString urlString = d->m_menuData.linkUrl.toString(QUrl::FullyEncoded); diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index be9f08ad1..08663a05e 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -99,6 +99,7 @@ public: OpenLinkInThisWindow, OpenLinkInNewWindow, OpenLinkInNewTab, + OpenLinkInNewBackgroundTab, CopyLinkToClipboard, DownloadLinkToDisk, @@ -137,7 +138,8 @@ public: enum WebWindowType { WebBrowserWindow, WebBrowserTab, - WebDialog + WebDialog, + WebBrowserBackgroundTab }; enum PermissionPolicy { diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 97b4159b1..2d928b0f5 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -108,6 +108,7 @@ \value OpenLinkInThisWindow Open the current link in the current window. (Added in Qt 5.6) \value OpenLinkInNewWindow Open the current link in a new window. (Added in Qt 5.6) \value OpenLinkInNewTab Open the current link in a new tab. (Added in Qt 5.6) + \value OpenLinkInNewBackgroundTab Open the current link in a new background tab. (Added in Qt 5.7) \value CopyLinkToClipboard Copy the current link to the clipboard. (Added in Qt 5.6) \value CopyImageToClipboard Copy the clicked image to the clipboard. (Added in Qt 5.6) @@ -154,6 +155,8 @@ A web browser tab. \value WebDialog A window without decoration. + \value WebBrowserBackgroundTab + A web browser tab without hiding the current visible WebEngineView. (Added in Qt 5.7) */ /*! |