summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativeanimation.cpp
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2010-07-06 13:41:49 (GMT)
committermae <qt-info@nokia.com>2010-07-07 11:47:17 (GMT)
commitcb406a116bf2237c743ac05882fb06927c70359c (patch)
treee3b9bbe6b62793e24ef7edb0b1c13f234032177c /src/declarative/util/qdeclarativeanimation.cpp
parentf5dca266bbf75abe24f39ac8e4d96796529afd77 (diff)
downloadQt-cb406a116bf2237c743ac05882fb06927c70359c.zip
Qt-cb406a116bf2237c743ac05882fb06927c70359c.tar.gz
Qt-cb406a116bf2237c743ac05882fb06927c70359c.tar.bz2
Added QDeclarativeSpringAnimation
The QDeclarativeSpringAnimation is a replacement for QDeclarativeSpringFollow. The idea is to remove the Follows quickly. Follows used to have an inSync property. In order to provide an alternative mechanism, the commit also fixes the running property for animations which are controlled by a behavior. Previously running would always return false and never change. Now running does change and indicates that the animation is running indeed.
Diffstat (limited to 'src/declarative/util/qdeclarativeanimation.cpp')
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index add27f3..6559bd5 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -142,6 +142,16 @@ bool QDeclarativeAbstractAnimation::isRunning() const
return d->running;
}
+// the behavior connects the animation to this slot
+void QDeclarativeAbstractAnimation::behaviorControlRunningChanged(bool running)
+{
+ Q_D(QDeclarativeAbstractAnimation);
+ if (d->disableUserControl && d->running != running) {
+ d->running = running;
+ emit runningChanged(running);
+ }
+}
+
//commence is called to start an animation when it is used as a
//simple animation, and not as part of a transition
void QDeclarativeAbstractAnimationPrivate::commence()