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, 5 insertions, 11 deletions

diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index e2fc23b1..4b09b35b 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/ScrollIndicator.qml
@@ -41,14 +41,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)
 
     padding: 2
 
-    //! [indicator]
-    indicator: Rectangle {
+    //! [contentItem]
+    contentItem: Rectangle {
         id: indicator
 
         implicitWidth: 2
@@ -58,12 +58,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"
             when: control.active
@@ -80,5 +74,5 @@ T.ScrollIndicator {
             }
         ]
     }
-    //! [indicator]
+    //! [contentItem]
 }