diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-28 16:05:47 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-29 08:39:02 +0000 |
commit | d1ff2fbb1a444dd8d1d574ac649dbc257325a5b7 (patch) | |
tree | 4d71f47d9191e1751a3d0d72dda51edd4bf77e8a /src | |
parent | 5e32318984260ae7e19cd7dd7632bd81edaeb88c (diff) |
Don't close a popup when pressed inside and released outside
Change-Id: Iadf58b0c98d7410e4cc9f75f4baf42adf8c521b8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 75dced8d..024890ab 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -338,7 +338,8 @@ bool QQuickPopupPrivate::handleMove(QQuickItem *item, const QPointF &point, ulon bool QQuickPopupPrivate::handleRelease(QQuickItem *item, const QPointF &point, ulong timestamp) { Q_UNUSED(timestamp); - tryClose(point, QQuickPopup::CloseOnReleaseOutside | QQuickPopup::CloseOnReleaseOutsideParent); + if (item != popupItem && !contains(pressPoint)) + tryClose(point, QQuickPopup::CloseOnReleaseOutside | QQuickPopup::CloseOnReleaseOutsideParent); pressPoint = QPointF(); touchId = -1; return blockInput(item, point); |