Changeset 846 for trunk/src/corelib/animation/qabstractanimation.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/animation/qabstractanimation.cpp (modified) (13 diffs)

trunk/src/corelib/animation/qabstractanimation.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -162 +162 @@
 QT_BEGIN_NAMESPACE
 
+
 Q_GLOBAL_STATIC(QThreadStorage<QUnifiedTimer *>, unifiedTimer)
+
 
 QUnifiedTimer::QUnifiedTimer() :
     QObject(), lastTick(0), timingInterval(DEFAULT_TIMER_INTERVAL),
     currentAnimationIdx(0), consistentTiming(false), slowMode(false),
-    isPauseTimerActive(false), runningLeafAnimations(0)
-{
-}
-
-QUnifiedTimer *QUnifiedTimer::instance()
+    slowdownFactor(5.0f), isPauseTimerActive(false), runningLeafAnimations(0)
+{
+    time.invalidate();
+}
+
+
+QUnifiedTimer *QUnifiedTimer::instance(bool create)
 {
     QUnifiedTimer *inst;
-    if (!unifiedTimer()->hasLocalData()) {
+#ifndef QT_NO_THREAD
+    if (create && !unifiedTimer()->hasLocalData()) {
         inst = new QUnifiedTimer;
         unifiedTimer()->setLocalData(inst);
@@ -180 +185 @@
         inst = unifiedTimer()->localData();
     }
+
+
+
+
     return inst;
 }
 
+
+
+
+
+
 void QUnifiedTimer::ensureTimerUpdate()
 {
-    if (isPauseTimerActive)
-        updateAnimationsTime();
+    QUnifiedTimer *inst = QUnifiedTimer::instance(false);
+    if (inst && inst->isPauseTimerActive)
+        inst->updateAnimationsTime();
 }
 
 void QUnifiedTimer::updateAnimationsTime()
 {
+
     // ignore consistentTiming in case the pause timer is active
     int delta = (consistentTiming && !isPauseTimerActive) ?
-                        timingInterval : time.elapsed() - lastTick;
-    if (slowMode)
-        delta /= 5;
-    lastTick = time.elapsed();
+                        timingInterval : totalElapsed - lastTick;
+    if (slowMode) {
+        if (slowdownFactor > 0)
+            delta = qRound(delta / slowdownFactor);
+        else
+            delta = 0;
+    }
+
+    lastTick = totalElapsed;
 
     //we make sure we only call update time if the time has actually changed
@@ -212 +233 @@
 }
 
+
+
+
+
+
+
+
 void QUnifiedTimer::restartAnimationTimer()
 {
@@ -243 +271 @@
             isPauseTimerActive = false;
             // invalidate the start reference time
-            time = QTime();
+            timee();
         } else {
             restartAnimationTimer();
@@ -262 +290 @@
 void QUnifiedTimer::registerAnimation(QAbstractAnimation *animation, bool isTopLevel)
 {
-    registerRunningAnimation(animation);
+    QUnifiedTimer *inst = instance(true); //we create the instance if needed
+    inst->registerRunningAnimation(animation);
     if (isTopLevel) {
         Q_ASSERT(!QAbstractAnimationPrivate::get(animation)->hasRegisteredTimer);
         QAbstractAnimationPrivate::get(animation)->hasRegisteredTimer = true;
-        animationsToStart << animation;
-        if (!startStopAnimationTimer.isActive())
-            startStopAnimationTimer.start(STARTSTOP_TIMER_DELAY, this);
+        animationsToStart << animation;
+        if (!startStopAnimationTimer.isActive())
+            );
     }
 }
@@ -274 +303 @@
 void QUnifiedTimer::unregisterAnimation(QAbstractAnimation *animation)
 {
-    unregisterRunningAnimation(animation);
-
-    if (!QAbstractAnimationPrivate::get(animation)->hasRegisteredTimer)
-        return;
-
-    int idx = animations.indexOf(animation);
-    if (idx != -1) {
-        animations.removeAt(idx);
-        // this is needed if we unregister an animation while its running
-        if (idx <= currentAnimationIdx)
-            --currentAnimationIdx;
-
-        if (animations.isEmpty() && !startStopAnimationTimer.isActive())
-            startStopAnimationTimer.start(STARTSTOP_TIMER_DELAY, this);
-    } else {
-        animationsToStart.removeOne(animation);
+    QUnifiedTimer *inst = QUnifiedTimer::instance(false);
+    if (inst) {
+        //at this point the unified timer should have been created
+        //but it might also have been already destroyed in case the application is shutting down
+
+        inst->unregisterRunningAnimation(animation);
+
+        if (!QAbstractAnimationPrivate::get(animation)->hasRegisteredTimer)
+            return;
+
+        int idx = inst->animations.indexOf(animation);
+        if (idx != -1) {
+            inst->animations.removeAt(idx);
+            // this is needed if we unregister an animation while its running
+            if (idx <= inst->currentAnimationIdx)
+                --inst->currentAnimationIdx;
+
+            if (inst->animations.isEmpty() && !inst->startStopAnimationTimer.isActive())
+                inst->startStopAnimationTimer.start(STARTSTOP_TIMER_DELAY, inst);
+        } else {
+            inst->animationsToStart.removeOne(animation);
+        }
     }
     QAbstractAnimationPrivate::get(animation)->hasRegisteredTimer = false;
@@ -339 +374 @@
     Q_Q(QAbstractAnimation);
     if (state == newState)
+
+
+
         return;
 
@@ -364 +402 @@
     if (oldState == QAbstractAnimation::Running) {
         if (newState == QAbstractAnimation::Paused && hasRegisteredTimer)
-            QUnifiedTimer::instance()->ensureTimerUpdate();
+            QUnifiedTimer::ensureTimerUpdate();
         //the animation, is not running any more
-        QUnifiedTimer::instance()->unregisterAnimation(q);
+        QUnifiedTimer::unregisterAnimation(q);
     } else if (newState == QAbstractAnimation::Running) {
-        QUnifiedTimer::instance()->registerAnimation(q, isTopLevel);
+        QUnifiedTimer::registerAnimation(q, isTopLevel);
     }
 
@@ -390 +428 @@
                 if (isTopLevel) {
                     // currentTime needs to be updated if pauseTimer is active
-                    QUnifiedTimer::instance()->ensureTimerUpdate();
+                    QUnifiedTimer::ensureTimerUpdate();
                     q->setCurrentTime(totalCurrentTime);
                 }
@@ -449 +487 @@
         emit stateChanged(oldState, d->state);
         if (oldState == QAbstractAnimation::Running)
-            QUnifiedTimer::instance()->unregisterAnimation(this);
+            QUnifiedTimer::unregisterAnimation(this);
     }
 }
@@ -548 +586 @@
     // then update the direction on this and all children and finally restart the pauseTimer if needed
     if (d->hasRegisteredTimer)
-        QUnifiedTimer::instance()->ensureTimerUpdate();
+        QUnifiedTimer::ensureTimerUpdate();
 
     d->direction = direction;
@@ -555 +593 @@
     if (d->hasRegisteredTimer)
         // needed to update the timer interval in case of a pause animation
-        QUnifiedTimer::instance()->restartAnimationTimer();
+        QUnifiedTimer::AnimationTimer();
 
     emit directionChanged(direction);