aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquicktransition_p.h
diff options
context:
space:
mode:
authorCharles Yin <yinyunqiao@gmail.com>2012-03-17 00:26:58 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-16 05:26:57 +0200
commit5bbb2e195b2cee8dbea0715ebf6eef41f36a3100 (patch)
tree884ee73c75f07a2add74896b9253e463da41a02f /src/quick/util/qquicktransition_p.h
parent99d9d9a38dd14d8d97d61ab25ce5bc37bb66d0d6 (diff)
Add a new running property to QQuickTransition
This read only property can be used to track the transition running state. As all animation items inside a Transition item are just animation defination templetes, so their running properties won't be updated during the transition animations running, which makes it hard to know the current running state of a transition animation. Change-Id: If7fc0616ba384abc6bf2da67c7c639430c3d8fb9 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/util/qquicktransition_p.h')
-rw-r--r--src/quick/util/qquicktransition_p.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/quick/util/qquicktransition_p.h b/src/quick/util/qquicktransition_p.h
index ebd82fde2c..976439c236 100644
--- a/src/quick/util/qquicktransition_p.h
+++ b/src/quick/util/qquicktransition_p.h
@@ -43,6 +43,7 @@
#define QQUICKTRANSITION_H
#include "qquickstate_p.h"
+#include <private/qabstractanimationjob_p.h>
#include <qqml.h>
#include <QtCore/qobject.h>
@@ -55,12 +56,11 @@ class QQuickAbstractAnimation;
class QQuickTransitionPrivate;
class QQuickTransitionManager;
class QQuickTransition;
-class QAbstractAnimationJob;
class Q_QUICK_EXPORT QQuickTransitionInstance
{
public:
- QQuickTransitionInstance();
+ QQuickTransitionInstance(QQuickTransitionPrivate *transition, QAbstractAnimationJob *anim);
~QQuickTransitionInstance();
void start();
@@ -69,6 +69,7 @@ public:
bool isRunning() const;
private:
+ QQuickTransitionPrivate *m_transition;
QAbstractAnimationJob *m_anim;
friend class QQuickTransition;
};
@@ -81,6 +82,7 @@ class Q_QUICK_EXPORT QQuickTransition : public QObject
Q_PROPERTY(QString from READ fromState WRITE setFromState NOTIFY fromChanged)
Q_PROPERTY(QString to READ toState WRITE setToState NOTIFY toChanged)
Q_PROPERTY(bool reversible READ reversible WRITE setReversible NOTIFY reversibleChanged)
+ Q_PROPERTY(bool running READ running NOTIFY runningChanged)
Q_PROPERTY(QQmlListProperty<QQuickAbstractAnimation> animations READ animations)
Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
Q_CLASSINFO("DefaultProperty", "animations")
@@ -102,6 +104,8 @@ public:
bool enabled() const;
void setEnabled(bool enabled);
+ bool running() const;
+
QQmlListProperty<QQuickAbstractAnimation> animations();
QQuickTransitionInstance *prepare(QQuickStateOperation::ActionList &actions,
@@ -116,6 +120,7 @@ Q_SIGNALS:
void toChanged();
void reversibleChanged();
void enabledChanged();
+ void runningChanged();
};
QT_END_NAMESPACE