From 855e23ebd6691b03420b7f1621ea4185447cfd54 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 25 Jan 2017 10:22:47 +0100 Subject: 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 --- src/quicktemplates2/qquickscrollbar_p_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/quicktemplates2/qquickscrollbar_p_p.h') 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; -- cgit v1.2.3