ScrollIndicator: use contentItem instead of indicator

Thanks to virtual resizeContent() we can finally use contentItem like
everywhere else, and cleanup the special indicator item.

Change-Id: Ia2bd62684d49a05c199e490750a31c13d2c22182
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

1 files changed, 7 insertions, 11 deletions

diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml
index 5787b60a..0e82b631 100644
--- a/src/imports/controls/universal/ScrollIndicator.qml
+++ b/src/imports/controls/universal/ScrollIndicator.qml
@@ -42,12 +42,14 @@ T.ScrollIndicator {
     id: control
 
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
-                            indicator.implicitWidth + leftPadding + rightPadding)
+                            contentItem.implicitWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
-                             indicator.implicitHeight + topPadding + bottomPadding)
+                             contentItem.implicitHeight + topPadding + bottomPadding)
+
+    //! [contentItem]
+    contentItem: Rectangle {
+        id: indicator
 
-    //! [indicator]
-    indicator: Rectangle {
         implicitWidth: 6
         implicitHeight: 6
 
@@ -55,12 +57,6 @@ T.ScrollIndicator {
         visible: control.size < 1.0
         opacity: 0.0
 
-        readonly property bool horizontal: control.orientation === Qt.Horizontal
-        x: control.leftPadding + (horizontal ? control.position * control.width : 0)
-        y: control.topPadding + (horizontal ? 0 : control.position * control.height)
-        width: horizontal ? control.size * control.availableWidth : implicitWidth
-        height: horizontal ? implicitHeight : control.size * control.availableHeight
-
         states: [
             State {
                 name: "active"
@@ -82,5 +78,5 @@ T.ScrollIndicator {
             }
         ]
     }
-    //! [indicator]
+    //! [contentItem]
 }