diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-10-16 16:35:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 20:47:08 +0200 |
| commit | a98b9435579f5abef82036e81af4488d8a464b66 (patch) | |
| tree | d647030face0d45f51c39f9c56ad77574871f4fe /src/widgets/styles/qstyleanimation.cpp | |
| parent | 037d1e18e39f24b8ebb2772c20444d4b44cfb12b (diff) | |
Styles: revise indeterminate progress bar animations
Remove dependencies to QProgressBar where possible. This makes
it possible to animate for example QQuickItem based progress
bars (read: the desktop components).
Change-Id: If208506702365895576238c24191b8d70b90841c
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/widgets/styles/qstyleanimation.cpp')
| -rw-r--r-- | src/widgets/styles/qstyleanimation.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/widgets/styles/qstyleanimation.cpp b/src/widgets/styles/qstyleanimation.cpp index 8bc8e9d241..297a929970 100644 --- a/src/widgets/styles/qstyleanimation.cpp +++ b/src/widgets/styles/qstyleanimation.cpp @@ -47,8 +47,6 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_ANIMATION - QStyleAnimation::QStyleAnimation(QObject *target) : QAbstractAnimation(target), _startTime(QTime::currentTime()) { @@ -128,21 +126,13 @@ void QProgressStyleAnimation::setSpeed(int speed) bool QProgressStyleAnimation::isUpdateNeeded() const { - QProgressBar *pb = qobject_cast<QProgressBar*>(parent()); - if (pb && pb->minimum() == 0 && pb->maximum() == 0) { - int current = animationStep(); - if (_step == -1 || _step != current) - { - _step = current; - return true; - } - } else { - // the progress bar is no longer indeterminate -> stop - const_cast<QProgressStyleAnimation *>(this)->stop(); + int current = animationStep(); + if (_step == -1 || _step != current) + { + _step = current; + return true; } return false; } -#endif // QT_NO_ANIMATION - QT_END_NAMESPACE |