From 65b690d82fb70e2960a5d2c40a0dac9707718b15 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 17 Oct 2016 23:01:24 +0200 Subject: 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 --- src/imports/controls/BusyIndicator.qml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/imports/controls/BusyIndicator.qml') 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] } -- cgit v1.2.3