diff options
author | Filippo Cucchetto <filippocucchetto@gmail.com> | 2014-11-19 19:36:26 +0100 |
---|---|---|
committer | Filippo Cucchetto <filippocucchetto@gmail.com> | 2014-11-24 13:04:31 +0100 |
commit | b1141eaa833cfada0d10f68017fb329e68c04869 (patch) | |
tree | 39f93c32bef2ea00460867411e909ba2fc8ae27c /src | |
parent | ea6d6a1f40156300558e2fdc342aa4af7bca44fe (diff) | |
download | qtquickcontrols-b1141eaa833cfada0d10f68017fb329e68c04869.tar.gz |
Fixed missing mouse event when the Menu control is dismissed
The QQuickPopupWindow doesn't forward the mouse event to the transient window
if the menu is dismissed
Task-number: QTBUG-40391
Change-Id: I2e5fd8b64c63d005445f9fd5e8b36e47b04c1e8b
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/controls/qquickpopupwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/controls/qquickpopupwindow.cpp b/src/controls/qquickpopupwindow.cpp index 70b27758..fa7ebee1 100644 --- a/src/controls/qquickpopupwindow.cpp +++ b/src/controls/qquickpopupwindow.cpp @@ -180,7 +180,8 @@ void QQuickPopupWindow::forwardEventToTransientParent(QMouseEvent *e) || e->type() == QEvent::MouseButtonPress)) { // Clicked outside any popup dismissPopup(); - } else if (transientParent()) { + } + if (transientParent()) { QPoint parentPos = transientParent()->mapFromGlobal(mapToGlobal(e->pos())); QMouseEvent pe = QMouseEvent(e->type(), parentPos, e->button(), e->buttons(), e->modifiers()); QGuiApplication::sendEvent(transientParent(), &pe); |