diff options
author | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-10-09 09:50:22 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@digia.com> | 2015-10-21 13:20:49 +0000 |
commit | fe83ad3ca6f13b0289a96d9459e94c45cd8b47c2 (patch) | |
tree | 468184e12ce79c16b48b293607b0127f43b9e672 /src/quick | |
parent | b9f7ef65adabf37d8b18703c39a80cbd84775604 (diff) |
Several cases of s/decelerating from/decelerating to/.
The relevant easing curves all start out fast and end stationery; so
it's at the *end* that they attain zero "velocity", so they're
decelerating *to* zero, not from it.
Change-Id: Ia691e39ef59708828a7e7f8af46b775abbff86fd
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/util/qquickanimation.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index ec3abf7090..1d0dbf64b3 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -2179,7 +2179,7 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) \li \inlineimage qeasingcurve-incubic.png \row \li \c Easing.OutCubic - \li Easing curve for a cubic (t^3) function: decelerating from zero velocity. + \li Easing curve for a cubic (t^3) function: decelerating to zero velocity. \li \inlineimage qeasingcurve-outcubic.png \row \li \c Easing.InOutCubic @@ -2195,7 +2195,7 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) \li \inlineimage qeasingcurve-inquart.png \row \li \c Easing.OutQuart - \li Easing curve for a quartic (t^4) function: decelerating from zero velocity. + \li Easing curve for a quartic (t^4) function: decelerating to zero velocity. \li \inlineimage qeasingcurve-outquart.png \row \li \c Easing.InOutQuart @@ -2211,7 +2211,7 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) \li \inlineimage qeasingcurve-inquint.png \row \li \c Easing.OutQuint - \li Easing curve for a quintic (t^5) function: decelerating from zero velocity. + \li Easing curve for a quintic (t^5) function: decelerating to zero velocity. \li \inlineimage qeasingcurve-outquint.png \row \li \c Easing.InOutQuint @@ -2227,7 +2227,7 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) \li \inlineimage qeasingcurve-insine.png \row \li \c Easing.OutSine - \li Easing curve for a sinusoidal (sin(t)) function: decelerating from zero velocity. + \li Easing curve for a sinusoidal (sin(t)) function: decelerating to zero velocity. \li \inlineimage qeasingcurve-outsine.png \row \li \c Easing.InOutSine @@ -2243,7 +2243,7 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) \li \inlineimage qeasingcurve-inexpo.png \row \li \c Easing.OutExpo - \li Easing curve for an exponential (2^t) function: decelerating from zero velocity. + \li Easing curve for an exponential (2^t) function: decelerating to zero velocity. \li \inlineimage qeasingcurve-outexpo.png \row \li \c Easing.InOutExpo @@ -2259,7 +2259,7 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) \li \inlineimage qeasingcurve-incirc.png \row \li \c Easing.OutCirc - \li Easing curve for a circular (sqrt(1-t^2)) function: decelerating from zero velocity. + \li Easing curve for a circular (sqrt(1-t^2)) function: decelerating to zero velocity. \li \inlineimage qeasingcurve-outcirc.png \row \li \c Easing.InOutCirc @@ -2276,7 +2276,7 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) \li \inlineimage qeasingcurve-inelastic.png \row \li \c Easing.OutElastic - \li Easing curve for an elastic (exponentially decaying sine wave) function: decelerating from zero velocity. + \li Easing curve for an elastic (exponentially decaying sine wave) function: decelerating to zero velocity. \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter. \li \inlineimage qeasingcurve-outelastic.png \row @@ -2309,7 +2309,7 @@ void QQuickPropertyAnimation::setTo(const QVariant &t) \li \inlineimage qeasingcurve-inbounce.png \row \li \c Easing.OutBounce - \li Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating from zero velocity. + \li Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating to zero velocity. \li \inlineimage qeasingcurve-outbounce.png \row \li \c Easing.InOutBounce |