aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/ProgressBar.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-10-18 20:05:21 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-10-19 08:53:07 +0000
commitbea8a8d79fdbb6e84bfb5e667b3f312cebf7946a (patch)
treeeba6a9ce27e361c32224096cd3cc0d98aea68a5c /src/imports/controls/material/ProgressBar.qml
parentb8dbf4b71e91a4a7f235278d3f67fce2f14c77d1 (diff)
Material: rewrite the indeterminate progress bar animation
Use a simple animated node instead of using the private animator API. Task-number: QTBUG-56601 Change-Id: I40cf3a8b762c37ce6e93cedf4f77fe53ad457d8f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/ProgressBar.qml')
-rw-r--r--src/imports/controls/material/ProgressBar.qml10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml
index 2b78be49..54152895 100644
--- a/src/imports/controls/material/ProgressBar.qml
+++ b/src/imports/controls/material/ProgressBar.qml
@@ -47,19 +47,13 @@ T.ProgressBar {
implicitHeight: Math.max(background ? background.implicitHeight : 0,
contentItem.implicitHeight + topPadding + bottomPadding)
- contentItem: ProgressStrip {
- id: strip
+ contentItem: ProgressBarImpl {
implicitHeight: 4
scale: control.mirrored ? -1 : 1
- indeterminate: control.indeterminate
color: control.Material.accentColor
progress: control.position
-
- StripAnimator {
- target: strip
- running: control.visible && control.indeterminate
- }
+ indeterminate: control.visible && control.indeterminate
}
background: Rectangle {