diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-09-09 07:33:05 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-09-09 07:33:05 (GMT) |
| commit | e7831cacd42f84eecff287c8df0b049f41b45bb7 (patch) | |
| tree | 185e33347d916976fa84e5008d39f888a677cebd /src | |
| parent | 8d130f26d9ef1e3acd76c0c158b41b8d2b3c1b44 (diff) | |
| download | Qt-e7831cacd42f84eecff287c8df0b049f41b45bb7.zip Qt-e7831cacd42f84eecff287c8df0b049f41b45bb7.tar.gz Qt-e7831cacd42f84eecff287c8df0b049f41b45bb7.tar.bz2 | |
Fix SmoothedAnimation test and docs
The SmoothedAnimation visual test was misleading, and has been expanded
to include more common use cases. The property documentation was also
slightly extended. This should help solve the confusion in the related
task.
Task-number: QTBUG-12114
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qdeclarativesmoothedanimation.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index c3fa7cf..fbd0762 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp @@ -403,6 +403,9 @@ void QDeclarativeSmoothedAnimation::setReversingMode(ReversingMode m) This property holds the animation duration, in msecs, used when tracking the source. Setting this to -1 (the default) disables the duration value. + + If the velocity value and the duration value are both enabled, then the animation will + use whichever gives the shorter duration. */ int QDeclarativeSmoothedAnimation::duration() const { @@ -432,6 +435,9 @@ qreal QDeclarativeSmoothedAnimation::velocity() const The default velocity of SmoothedAnimation is 200 units/second. Setting this to -1 disables the velocity value. + + If the velocity value and the duration value are both enabled, then the animation will + use whichever gives the shorter duration. */ void QDeclarativeSmoothedAnimation::setVelocity(qreal v) { @@ -446,7 +452,7 @@ void QDeclarativeSmoothedAnimation::setVelocity(qreal v) /*! \qmlproperty int SmoothedAnimation::maximumEasingTime - This property specifies the maximum time, in msecs, an "eases" during the follow should take. + This property specifies the maximum time, in msecs, any "eases" during the follow should take. Setting this property causes the velocity to "level out" after at a time. Setting a negative value reverts to the normal mode of easing over the entire animation duration. |