aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/BusyIndicator.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-10-17 23:01:24 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-10-18 14:42:45 +0000
commit65b690d82fb70e2960a5d2c40a0dac9707718b15 (patch)
tree71b40331ac1401c6b7867f23cb384e6670bd1a98 /src/imports/controls/BusyIndicator.qml
parent84e83e27dfba7215cb7a8f7210dab84cc400bb07 (diff)
Default: rewrite the busy indicator animation
Use a simple animated node instead of using the private animator API. Task-number: QTBUG-56601 Change-Id: Id420ef6faae0ddfc3a571e9b12be59c0d263fc38 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/BusyIndicator.qml')
-rw-r--r--src/imports/controls/BusyIndicator.qml13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml
index 936764fa..16fb6091 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/BusyIndicator.qml
@@ -48,18 +48,13 @@ T.BusyIndicator {
padding: 6
//! [contentItem]
- contentItem: BusyRing {
- id: ring
+ contentItem: BusyIndicatorImpl {
implicitWidth: 48
implicitHeight: 48
- opacity: control.running ? 1 : 0
-
- Behavior on opacity { OpacityAnimator { duration: 250 } }
- BusyRingAnimator {
- target: ring
- running: control.visible && control.running
- }
+ opacity: control.running ? 1 : 0
+ visible: control.running || animator.running
+ Behavior on opacity { OpacityAnimator { id: animator; duration: 250 } }
}
//! [contentItem]
}