aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qdeclarativetransition_p.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-02-03 12:26:37 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-07 05:32:47 +0100
commitce3dee765c858a0b573d468ef8fee6b838e576d1 (patch)
treeb7026a061b0b58bac6af30eaab6e610c5ebeb504 /src/quick/util/qdeclarativetransition_p.h
parent0ca9d3f0f720e1933379ef40bc5c29253e21cba0 (diff)
Add and use new animation backend.
The new backend improves performance, and allows us to create multiple running animation jobs from a single Transition. It is based off of the existing Qt animation framework. Change-Id: Id1d0162f6e5c65bf31267f3f9f2042c354375d57 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/quick/util/qdeclarativetransition_p.h')
-rw-r--r--src/quick/util/qdeclarativetransition_p.h23
1 files changed, 20 insertions, 3 deletions
diff --git a/src/quick/util/qdeclarativetransition_p.h b/src/quick/util/qdeclarativetransition_p.h
index a4f6dc46a5..64fd45b725 100644
--- a/src/quick/util/qdeclarativetransition_p.h
+++ b/src/quick/util/qdeclarativetransition_p.h
@@ -43,7 +43,6 @@
#define QDECLARATIVETRANSITION_H
#include "qdeclarativestate_p.h"
-
#include <qdeclarative.h>
#include <QtCore/qobject.h>
@@ -55,6 +54,25 @@ QT_BEGIN_NAMESPACE
class QDeclarativeAbstractAnimation;
class QDeclarativeTransitionPrivate;
class QDeclarativeTransitionManager;
+class QDeclarativeTransition;
+class QAbstractAnimationJob;
+
+class Q_QUICK_EXPORT QDeclarativeTransitionInstance
+{
+public:
+ QDeclarativeTransitionInstance();
+ ~QDeclarativeTransitionInstance();
+
+ void start();
+ void stop();
+
+ bool isRunning() const;
+
+private:
+ QAbstractAnimationJob *m_anim;
+ friend class QDeclarativeTransition;
+};
+
class Q_QUICK_EXPORT QDeclarativeTransition : public QObject
{
Q_OBJECT
@@ -86,12 +104,11 @@ public:
QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations();
- void prepare(QDeclarativeStateOperation::ActionList &actions,
+ QDeclarativeTransitionInstance *prepare(QDeclarativeStateOperation::ActionList &actions,
QList<QDeclarativeProperty> &after,
QDeclarativeTransitionManager *end);
void setReversed(bool r);
- void stop();
Q_SIGNALS:
void fromChanged();