diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-18 20:34:17 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-25 21:30:18 +0000 |
| commit | b0fd258cbb2a17610a185f76076cf6cda0bdfc09 (patch) | |
| tree | 7a4f711ca7bb07ab54a505936cbe547552598e22 /src/quicktemplates2/qquickpopup.cpp | |
| parent | e33443d9b8de1917d8d3b85f185bbb75b78dc448 (diff) | |
Add Drawer::interactive
[ChangeLog][Controls][Drawer] Added interactive property that specifies
whether the drawer reacts to swipes. This can be used to make drawer a
non-closable persistent side-bar.
Task-number: QTBUG-53169
Change-Id: I00a794b5ce47b86fcb28e0db784ca0488cd13a7d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 7ff99c49..95d1a7e2 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -209,6 +209,7 @@ QQuickPopupPrivate::QQuickPopupPrivate() , allowVerticalResize(true) , allowHorizontalResize(true) , hadActiveFocusBeforeExitTransition(false) + , interactive(true) , x(0) , y(0) , effectiveX(0) @@ -257,6 +258,9 @@ void QQuickPopupPrivate::closeOrReject() bool QQuickPopupPrivate::tryClose(QQuickItem *item, QMouseEvent *event) { + if (!interactive) + return false; + const bool isPress = event->type() == QEvent::MouseButtonPress; const bool onOutside = closePolicy.testFlag(isPress ? QQuickPopup::CloseOnPressOutside : QQuickPopup::CloseOnReleaseOutside); const bool onOutsideParent = closePolicy.testFlag(isPress ? QQuickPopup::CloseOnPressOutsideParent : QQuickPopup::CloseOnReleaseOutsideParent); |