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();