Add ScrollBar::policy

[ChangeLog][Controls][ScrollBar] Added a policy-property, which holds
whether the scroll bar is shown always/never/as needed (default).

Change-Id: Ibe25edaef04a7926bc12c59913efa7a3d43a5ccf
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 33 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index d2d9a194..f118a2b3 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
@@ -164,7 +164,8 @@ QQuickScrollBarPrivate::QQuickScrollBarPrivate()
       moving(false),
       interactive(true),
       orientation(Qt::Vertical),
-      snapMode(QQuickScrollBar::NoSnap)
+      snapMode(QQuickScrollBar::NoSnap),
+      policy(QQuickScrollBar::AsNeeded)
 {
 }
 
@@ -487,6 +488,37 @@ void QQuickScrollBar::setInteractive(bool interactive)
 }
 
 /*!
+    \since QtQuick.Controls 2.2
+    \qmlproperty enumeration QtQuick.Controls::ScrollBar::policy
+
+    This property holds the policy of the scroll bar. The default policy is \c ScrollBar.AsNeeded.
+
+    Possible values:
+    \value ScrollBar.AsNeeded The scroll bar is only shown when the content is too large to fit.
+    \value ScrollBar.AlwaysOff The scroll bar is never shown.
+    \value ScrollBar.AlwaysOn The scroll bar is always shown.
+
+    The following example keeps the vertical scroll bar always visible:
+
+    \snippet qtquickcontrols2-scrollbar-policy.qml 1
+*/
+QQuickScrollBar::Policy QQuickScrollBar::policy() const
+{
+    Q_D(const QQuickScrollBar);
+    return d->policy;
+}
+
+void QQuickScrollBar::setPolicy(Policy policy)
+{
+    Q_D(QQuickScrollBar);
+    if (d->policy == policy)
+        return;
+
+    d->policy = policy;
+    emit policyChanged();
+}
+
+/*!
     \qmlmethod void QtQuick.Controls::ScrollBar::increase()
 
     Increases the position by \l stepSize or \c 0.1 if stepSize is \c 0.0.