diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-11 13:43:13 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-12 07:18:10 +0000 |
commit | 56c8a1904447c06f40d8605daaf7a9e433fc1b96 (patch) | |
tree | 254a51bb8d4215407c096cceb8c27bca10b5593f /src | |
parent | 5f324097f2901ab7a7450856f7391f636cf044ad (diff) |
QWidgetWindow: Restrict context menu trigger to the widget's rectangle.
Task-number: QTBUG-44913
Change-Id: I0d9411b4bbd6a6affe85eb9856a1eb93d444d377
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/widgets/kernel/qwidgetwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index b7ffc20c8e..12f5d4b8b0 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -554,7 +554,8 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) &qt_button_down, qt_last_mouse_receiver); } #ifndef QT_NO_CONTEXTMENU - if (event->type() == contextMenuTrigger && event->button() == Qt::RightButton) { + if (event->type() == contextMenuTrigger && event->button() == Qt::RightButton + && m_widget->rect().contains(event->pos())) { QContextMenuEvent e(QContextMenuEvent::Mouse, mapped, event->globalPos(), event->modifiers()); QGuiApplication::sendSpontaneousEvent(receiver, &e); } |