summaryrefslogtreecommitdiffstats
path: root/src/corelib/animation
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-2/+0
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * removed a debug traceThierry Bastian2010-01-221-2/+0
| |
* | Adding a warning if the property of an animation is not writableThierry Bastian2010-01-221-1/+3
| |
* | Merge branch '4.6'Thiago Macieira2010-01-211-5/+12
|\ \ | |/ | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * Make the qWarnings in the animation API more useful.Alexis Menard2010-01-191-5/+12
| | | | | | | | | | Task-number:QTBUG-6895 Reviewed-by:Thierry
* | Make the animation api compile when QT_NO_THREAD is definedLeonardo Sobral Cunha2010-01-213-0/+13
| | | | | | | | | | Task-number: QTBUG-6890 Reviewed-by: Thierry
* | Merge branch '4.6'Thiago Macieira2010-01-1320-20/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Update copyright year to 2010Jason McDonald2010-01-0620-20/+20
| | | | | | | | Reviewed-by: Trust Me
* | Don't use QTime::elapsed() on windows to query for the actual time.Jan-Arve Sæther2010-01-082-2/+62
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that the time spent between the execution of QTime::start() and QTime::elapsed() can be higher than what QTime::elapsed() sometimes reports. (To put it differently, QTime::elapsed() was sometimes returning a time that was *less* than the actual time spent.) Note that this is *not* a bug on Windows, since GetLocalTime explicitly mentions that we should not use local system times to to relative comparisions (this is what elapsed() currently do). This is also partly reflected by the documentation of QTime::elapsed(), where it says that the result of elapsed() is undefined if the clock setting has been changed. Due to the fact mentioned in the above paragraph this is also a potential problem on other platforms (at least Linux and Mac). However, these platforms do not suffer from the immediate problem we observed on windows (that QTime::elapsed() could return a too small value), so this commit only fixes the problem on Windows (it now uses GetTickCount instead of QTime). For the other platforms the behaviour should be unchanged, since we still use QTime. This was found by running the QPauseAnimation autotest, where some tests were unstable (and failed). However, it did not fail on all windows systems. (Luckilly it failed on my Win 7 system) Reviewed-by: Leo
* Doc: Try to explain better when and how the easing curve is appliedJan-Arve Sæther2009-12-101-0/+7
| | | | | | | Maybe not perfect, but it should be *better* at least. Task-number: QTBUG-6623 Reviewed-by: Thierry
* Make the animation timer more consistentThierry Bastian2009-11-251-2/+7
| | | | | | | | We ensure that the startStop timer is always ticking before the animation timer. Task-number: QTBUG-5967 Reviewed-by: Aaron Kennedy
* Complete QVariantAnimation doc to mention qRegisterAnimationInterpolatorThierry Bastian2009-11-191-1/+18
| | | | Task-number: QTBUG-5970
* doc: Fixed qdoc errors.Martin Smith2009-11-161-1/+1
|
* Fix docs for animation apiLeonardo Sobral Cunha2009-11-092-9/+9
| | | | | | | | All animation api code snippets should use references instead of local variables. Task-number: QTBUG-5616 Reviewed-by: thierry
* Fix buildThierry Bastian2009-11-061-2/+2
|
* add slow mode in private API for testingThierry Bastian2009-11-062-2/+8
| | | | this was suggested by Michael B
* Animations should only be registered if their new state is runningThierry Bastian2009-11-061-1/+1
|
* Revert "Make animation timer slightly more accurate with default interval of 15"Thierry Bastian2009-11-051-2/+1
| | | | | | | The new threashold for using the multimedia timer is 20, so we can get back to 16 ms for the interval. This reverts commit bdcde683bc863d0c574b1e4d64b5a16ba0130596.
* API review from yesterday made a bug appear for the pause animationsThierry Bastian2009-11-051-6/+12
|
* Another fix for the registration of the animationsThierry Bastian2009-11-051-3/+4
|
* Result API review with JasminThierry Bastian2009-11-0413-57/+83
| | | | | | | | | | | | | | | | | QAbstractAnimation: currentTime returns the "complete" current time currentLoopTime() returns the time inside the current loop add setPaused(bool) for consistency with QTimeLine stateChanged: newState passed as first paramater (before oldState) for consistency with the reset of Qt QAnimationGroup: rename clearAnimations to clear rename insertAnimationAt to insertAnimation rename takeAnimationAt to takeAnimation QSequentialAnimationGroup: rename insertPauseAt to insertPause
* Fix to the unregistration of the animation to the global timerThierry Bastian2009-11-041-19/+11
| | | | | | | The unregistration has to happen befaire calling virtual methods to support changing the state in those functions. Reviewed-by: ogoffart
* Make animation timer slightly more accurate with default interval of 15Thierry Bastian2009-11-021-1/+2
| | | | | | On windows this will make it much more accurate Reviewed-by: ogoffart
* Add missing QENUM declarations (needed by declarative).Warwick Allison2009-11-021-0/+2
|
* Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-301-12/+0
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-drivenBradley T. Hughes2009-10-282-21/+21
| |\
| * | Remove workarounds for Win32 event dispatcher bugsBradley T. Hughes2009-10-201-12/+0
| | | | | | | | | | | | | | | | | | | | | This includes the startstop timer delay in QAbstractAnimation, and the inSizeMove workaround for paint events. Reviewed-by: Prasanth Ullattil
* | | MAke sure we call setCurrentTime when an animation is startedThierry Bastian2009-10-232-12/+9
| |/ |/| | | | | | | | | This could be prevented by a pause animation currently running. Reviewed-by: Leo
* | Fixes to the way animations are registered to the timerThierry Bastian2009-10-211-12/+9
| | | | | | | | | | | | | | It could happen that an animation would be unregistered when it shouldn't. Reviewed-by: Leo Cunha
* | Improve performance when starting a lot of animationsThierry Bastian2009-10-211-2/+3
| | | | | | | | | | | | | | We avoid stopping/starting the timer over and over again Patch suggested by Aaron. Reviewed-by: Aaron Kennedy
* | Fixed a bug in that could unregister not-registered animationsThierry Bastian2009-10-201-2/+3
| |
* | Make the default duration of pause animations 250msThierry Bastian2009-10-201-1/+2
| |
* | Make the total duration of animation be 0 if duration is 0Thierry Bastian2009-10-201-8/+8
|/
* Update lastTick on all timerTicks in QAbstractAnimationLeonardo Sobral Cunha2009-10-091-7/+4
| | | | | | | This is needed in case we change consistentTime while the animation is running. Reviewed-by: thierry
* In QParallelAnimationGroup, only stop the children if they arent stoppedLeonardo Sobral Cunha2009-10-071-3/+5
| | | | | | | The previous code was settingCurrentTime on all animatios, even on those that had already finished long ago. Reviewed-by: thierry
* Avoids timer ticks when there are only pause animations runningLeonardo Sobral Cunha2009-10-074-47/+186
| | | | | | | | | | | | | | When there are only pause animations running, the timer will stop and restart when the closest pause animation finishes. While there are only pause animations running, there are no additional timer ticks, but if there is at least one animation running that is not a group or a pause, then the global animation timer will restore it's update interval. Includes a new auto-test for the QPauseAnimation class. Task-number: QT-941 Reviewed-by: thierry Reviewed-by: janarve
* Removed unused function QUnifiedTimer::elapsedTime from animation api privateLeonardo Sobral Cunha2009-10-071-1/+0
| | | | Reviewed-by: thierry
* In QAbstractAnimation::setState setCurrentTime when animation pausesLeonardo Sobral Cunha2009-10-071-8/+9
| | | | | | | If we want to avoid timer ticks in QPauseAnimation, We need to update the current time when an animation pauses, for being able to resume correctly. Reviewed-by: thierry
* QParallelAnimationGroup: set the correct state for the animationsThierry Bastian2009-10-062-29/+49
| | | | | | | There were cases (now covered by autotests) where the state of the animations could be wrong. Reviewed-by: janarve
* The threshold for system basic timers has changed on windowsThierry Bastian2009-10-061-3/+3
| | | | | | | | This breaks the animations in main window because dragging a dock widget when it is undocked creates another event loop and the Qt events are not processed any more. Reviewed-by: Trust Me
* QPropertyAnimation now uses QMetaObject::metacall instead of qt_metacallThierry Bastian2009-10-051-2/+2
| | | | | | | This allows the animations to work with the newly integrated dynamic metaobject Reviewed-by: Michael Brasser
* Adds a bool to QAbstractAnimationPrivate to keep track of top-level animationsLeonardo Sobral Cunha2009-10-022-9/+16
| | | | | | | | Also refactored the timer verifications on (un)registerAnimation: we should never register an animation that has a registeredTimer, but we can unregister an animation several times. Reviewed-by: thierry
* Fix qdoc error.Jason McDonald2009-09-291-2/+2
| | | | Reviewed-by: Trust Me
* Removed unused line in QAbstractAnimationLeonardo Sobral Cunha2009-09-281-1/+0
| | | | | | This line was a left-over from commit 86f5a63b018441 Reviewed-by: thierry
* Refactor of timer verification in QAbstractAnimationLeonardo Sobral Cunha2009-09-281-6/+4
| | | | Reviewed-by: thierry
* Animations: updateCurrentTime now receives the currentTime as paramaterThierry Bastian2009-09-2810-18/+18
| | | | Reviewed-by: Leo
* Small change in the API of animationsThierry Bastian2009-09-2311-30/+24
| | | | | | | | We're not taking a parameter in updateCurrentTime any more because that parameter was the total currenttime. So it was taking into account the currenttime and the currentloop at once. This was inconsistent Reviewed-by: Leo
* Fix a possible warning on animations used with statesThierry Bastian2009-09-221-7/+11
| | | | | | The problem is that sometimes timerevents get compressed. So in the unified timer, we need to make sure that some time has passed between 2 ticks.
* small optimization for variant handling in animationsThierry Bastian2009-09-111-3/+9
| | | | Just one test less
* animations now display a warning if they don't have a end valueThierry Bastian2009-09-111-2/+2
| | | | also improved the autotests