aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickscrollbar_p_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-01-25 10:22:47 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-01-26 14:12:44 +0000
commit855e23ebd6691b03420b7f1621ea4185447cfd54 (patch)
tree5e7f8c314a5d8425918f22783119aaa36b701d3c /src/quicktemplates2/qquickscrollbar_p_p.h
parentf2602121228e910b9e400dadd2b8ee951052c3ba (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_p.h')
-rw-r--r--src/quicktemplates2/qquickscrollbar_p_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickscrollbar_p_p.h b/src/quicktemplates2/qquickscrollbar_p_p.h
index fa5bd0b5..cbbef2c8 100644
--- a/src/quicktemplates2/qquickscrollbar_p_p.h
+++ b/src/quicktemplates2/qquickscrollbar_p_p.h
@@ -70,6 +70,7 @@ public:
qreal snapPosition(qreal position) const;
qreal positionAt(const QPointF &point) const;
+ void setInteractive(bool interactive);
void updateActive();
void resizeContent() override;
@@ -86,6 +87,7 @@ public:
bool pressed;
bool moving;
bool interactive;
+ bool explicitInteractive;
Qt::Orientation orientation;
QQuickScrollBar::SnapMode snapMode;
QQuickScrollBar::Policy policy;