diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-18 13:11:03 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-18 14:42:50 +0000 |
| commit | 04afbe9e3b7aae98a48337ffd0b4d99858533309 (patch) | |
| tree | bf676db51c6e6f1270ae9ba66f299cdc36af6880 /src/imports/controls/material/BusyIndicator.qml | |
| parent | 4077c605ab4c971ccabc37001875cfd19a744e98 (diff) | |
Material: rewrite the busy indicator animation
Use a simple animated node instead of using the private animator API.
Task-number: QTBUG-56601
Change-Id: I9dc474f75b5c5a6fcd8d11735970c1a354ed5b56
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/BusyIndicator.qml')
| -rw-r--r-- | src/imports/controls/material/BusyIndicator.qml | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index 3077ceb7..5a17c002 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -47,24 +47,13 @@ T.BusyIndicator { padding: 6 - contentItem: ProgressRing { - id: ring - x: control.leftPadding + (control.availableWidth - width) / 2 - y: control.topPadding + (control.availableHeight - height) / 2 + contentItem: BusyIndicatorImpl { implicitWidth: 48 implicitHeight: 48 - width: size - height: size - opacity: control.running ? 1 : 0 color: control.Material.accentColor - readonly property real size: Math.min(control.availableWidth, control.availableHeight) - - Behavior on opacity { OpacityAnimator { duration: 250 } } - - RingAnimator { - 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 } } } } |