ScrollBar: add horizontal and vertical properties for convenience

[ChangeLog][Controls][ScrollBar] Added horizontal and vertical
properties to make it more convenient to create orientation-dependent
bindings in styles.

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

3 files changed, 38 insertions, 0 deletions

diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index 5a111298..93b23829 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -257,6 +257,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
     qmlRegisterType<QQuickIcon>();
     qmlRegisterType<QQuickAbstractButton, 3>(uri, 2, 3, "AbstractButton");
     qmlRegisterType<QQuickRangeSlider, 3>(uri, 2, 3, "RangeSlider");
+    qmlRegisterType<QQuickScrollBar, 3>(uri, 2, 3, "ScrollBar");
     qmlRegisterType<QQuickSlider, 3>(uri, 2, 3, "Slider");
 }
 
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index 3dcb720a..9aeec74f 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
@@ -422,6 +422,8 @@ void QQuickScrollBar::setPressed(bool pressed)
 
     This property is automatically set when the scroll bar is
     \l {Attaching ScrollBar to a Flickable}{attached to a flickable}.
+
+    \sa horizontal, vertical
 */
 Qt::Orientation QQuickScrollBar::orientation() const
 {
@@ -543,6 +545,36 @@ void QQuickScrollBar::setPolicy(Policy policy)
 }
 
 /*!
+    \since QtQuick.Controls 2.3
+    \qmlproperty bool QtQuick.Controls::ScrollBar::horizontal
+    \readonly
+
+    This property holds whether the scroll bar is horizontal.
+
+    \sa orientation
+*/
+bool QQuickScrollBar::isHorizontal() const
+{
+    Q_D(const QQuickScrollBar);
+    return d->orientation == Qt::Horizontal;
+}
+
+/*!
+    \since QtQuick.Controls 2.3
+    \qmlproperty bool QtQuick.Controls::ScrollBar::vertical
+    \readonly
+
+    This property holds whether the scroll bar is vertical.
+
+    \sa orientation
+*/
+bool QQuickScrollBar::isVertical() const
+{
+    Q_D(const QQuickScrollBar);
+    return d->orientation == Qt::Vertical;
+}
+
+/*!
     \qmlmethod void QtQuick.Controls::ScrollBar::increase()
 
     Increases the position by \l stepSize or \c 0.1 if stepSize is \c 0.0.
diff --git a/src/quicktemplates2/qquickscrollbar_p.h b/src/quicktemplates2/qquickscrollbar_p.h
index 1b18c4ad..523e27f0 100644
--- a/src/quicktemplates2/qquickscrollbar_p.h
+++ b/src/quicktemplates2/qquickscrollbar_p.h
@@ -67,6 +67,8 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollBar : public QQuickControl
     Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged 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)
+    Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3)
+    Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3)
 
 public:
     explicit QQuickScrollBar(QQuickItem *parent = nullptr);
@@ -112,6 +114,9 @@ public:
     Policy policy() const;
     void setPolicy(Policy policy);
 
+    bool isHorizontal() const;
+    bool isVertical() const;
+
 public Q_SLOTS:
     void increase();
     void decrease();