diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-25 10:22:47 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-26 14:12:44 +0000 |
| commit | 855e23ebd6691b03420b7f1621ea4185447cfd54 (patch) | |
| tree | 5e7f8c314a5d8425918f22783119aaa36b701d3c /src/quicktemplates2/qquickscrollbar_p.h | |
| parent | f2602121228e910b9e400dadd2b8ee951052c3ba (diff) | |
Keep track whether ScrollBar::interactive is explicitly set
The upcoming ScrollView toggles between interactive and non-interactive
scroll bars depending on whether it is interacted via touch or a mouse
device. This allows ScrollView to check whether the user or style
explicitly requested a specific mode and respect it.
Change-Id: I69d21652b3a91cb9db0f76ba52adc35ccd612ab1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickscrollbar_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickscrollbar_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickscrollbar_p.h b/src/quicktemplates2/qquickscrollbar_p.h index dabc860b..868cb5d8 100644 --- a/src/quicktemplates2/qquickscrollbar_p.h +++ b/src/quicktemplates2/qquickscrollbar_p.h @@ -65,7 +65,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollBar : public QQuickControl Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL) Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged FINAL REVISION 2) - Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged FINAL REVISION 2) + Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive RESET resetInteractive NOTIFY interactiveChanged FINAL REVISION 2) Q_PROPERTY(Policy policy READ policy WRITE setPolicy NOTIFY policyChanged FINAL REVISION 2) public: @@ -100,6 +100,7 @@ public: bool isInteractive() const; void setInteractive(bool interactive); + void resetInteractive(); enum Policy { AsNeeded = Qt::ScrollBarAsNeeded, |