diff options
| author | Charles Yin <yinyunqiao@gmail.com> | 2012-03-08 00:12:58 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-13 23:50:52 +0100 |
| commit | c67ed6887a8ee2fac935d81630b4b77926486c9b (patch) | |
| tree | 1b9dff98f2fe8e83927400b3743923db93fa9a42 /src/quick/util | |
| parent | c291efff26c13963cf98c127bfa759f89f103e48 (diff) | |
More refactoring on animation controller
Add a flag and helper functions for disabling user control in QAbstractAnimationJob
class and make it synchronized with QDeclarativeAnimation class's disableUserControl
flag.
Change-Id: Ifa84ab0c78291941469c33f2cafe5f61ee718b2c
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickanimationcontroller.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp index a3e343f26d..2b5d174caa 100644 --- a/src/quick/util/qquickanimationcontroller.cpp +++ b/src/quick/util/qquickanimationcontroller.cpp @@ -174,6 +174,7 @@ void QQuickAnimationController::reload() if (oldInstance && oldInstance != d->animationInstance) delete oldInstance; d->animationInstance->setLoopCount(1); + d->animationInstance->setDisableUserControl(); d->animationInstance->start(); d->animationInstance->pause(); updateProgress(); @@ -186,6 +187,7 @@ void QQuickAnimationController::updateProgress() if (!d->animationInstance) return; + d->animationInstance->setDisableUserControl(); d->animationInstance->start(); QQmlAnimationTimer::unregisterAnimation(d->animationInstance); d->animationInstance->setCurrentTime(d->progress * d->animationInstance->duration()); |