diff options
author | Valentin Fokin <fokinv@inf.u-szeged.hu> | 2017-10-18 12:48:04 +0200 |
---|---|---|
committer | Valentin Fokin <fokinv@inf.u-szeged.hu> | 2017-10-24 07:54:46 +0000 |
commit | cc6a4199225f034075751580fd5fd816cbfee6ea (patch) | |
tree | feded5247484f5e2a5919a602550f8bcfc2047c9 /src | |
parent | 42ba71bdc66a2228b027f9367da25bef10e269dc (diff) |
Fix Qt::NoContextMenu policy handling in QWebEngineView
Task-number: QTBUG-62345
Change-Id: I4846e15f007c6792ad02fc49179a6e30deafa4c7
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 0037f7e50..9b3f62217 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -315,9 +315,15 @@ void QWebEngineView::setZoomFactor(qreal factor) */ bool QWebEngineView::event(QEvent *ev) { - // We swallow spontaneous contextMenu events and synthethize those back later on when we get the - // HandleContextMenu callback from chromium if (ev->type() == QEvent::ContextMenu) { + if (contextMenuPolicy() == Qt::NoContextMenu) { + // We forward the contextMenu event to the parent widget + ev->ignore(); + return false; + } + + // We swallow spontaneous contextMenu events and synthethize those back later on when we get the + // HandleContextMenu callback from chromium ev->accept(); return true; } |