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.

1 files changed, 25 insertions, 2 deletions

diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index 047993e..4480e75 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -58,7 +58,8 @@ class QDeclarativeBehaviorPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QDeclarativeBehavior)
 public:
-    QDeclarativeBehaviorPrivate() : animation(0), enabled(true), finalized(false) {}
+    QDeclarativeBehaviorPrivate() : animation(0), enabled(true), finalized(false)
+      , blockRunningChanged(false) {}
 
     QDeclarativeProperty property;
     QVariant currentValue;
@@ -66,6 +67,7 @@ public:
     QDeclarativeGuard<QDeclarativeAbstractAnimation> animation;
     bool enabled;
     bool finalized;
+    bool blockRunningChanged;
 };
 
 /*!
@@ -132,9 +134,26 @@ void QDeclarativeBehavior::setAnimation(QDeclarativeAbstractAnimation *animation
     if (d->animation) {
         d->animation->setDefaultTarget(d->property);
         d->animation->setDisableUserControl();
+        connect(d->animation->qtAnimation(),
+                SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)),
+                this,
+                SLOT(qtAnimationStateChanged(QAbstractAnimation::State,QAbstractAnimation::State)));
+        connect(this,
+                SIGNAL(qtAnimationRunningChanged(bool)),
+                d->animation,
+                SLOT(behaviorControlRunningChanged(bool)));
     }
 }
 
+
+void QDeclarativeBehavior::qtAnimationStateChanged(QAbstractAnimation::State newState,QAbstractAnimation::State)
+{
+    Q_D(QDeclarativeBehavior);
+    if (!d->blockRunningChanged)
+        emit qtAnimationRunningChanged(newState == QAbstractAnimation::Running);
+}
+
+
 /*!
     \qmlproperty bool Behavior::enabled
     Whether the Behavior will be triggered when the property it is tracking changes.
@@ -173,8 +192,11 @@ void QDeclarativeBehavior::write(const QVariant &value)
     d->currentValue = d->property.read();
     d->targetValue = value;
 
-    if (d->animation->qtAnimation()->duration() != -1)
+    if (d->animation->qtAnimation()->duration() != -1
+            && d->animation->qtAnimation()->state() != QAbstractAnimation::Stopped) {
+        d->blockRunningChanged = true;
         d->animation->qtAnimation()->stop();
+    }
 
     QDeclarativeStateOperation::ActionList actions;
     QDeclarativeAction action;
@@ -186,6 +208,7 @@ void QDeclarativeBehavior::write(const QVariant &value)
     QList<QDeclarativeProperty> after;
     d->animation->transition(actions, after, QDeclarativeAbstractAnimation::Forward);
     d->animation->qtAnimation()->start();
+    d->blockRunningChanged = false;
     if (!after.contains(d->property))
         QDeclarativePropertyPrivate::write(d->property, value, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);    
 }