aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qdeclarativeanimation.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-12-08 10:36:44 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-13 02:40:04 +0100
commit2a3990fc4125eeb0c73eaae05450789717dfd045 (patch)
tree9f352b6f7b674cfe7ee55f2480c46354e9dcd413 /src/quick/util/qdeclarativeanimation.cpp
parentde33a805de96681f98998179acd4bea61eae5d5a (diff)
Add basic custom easing curve docs and test
Change-Id: Id38434cb71417276635b501d13d0145759de9864 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/util/qdeclarativeanimation.cpp')
-rw-r--r--src/quick/util/qdeclarativeanimation.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/quick/util/qdeclarativeanimation.cpp b/src/quick/util/qdeclarativeanimation.cpp
index 8c21d11037..0c318061bb 100644
--- a/src/quick/util/qdeclarativeanimation.cpp
+++ b/src/quick/util/qdeclarativeanimation.cpp
@@ -1916,6 +1916,7 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t)
\qmlproperty real QtQuick2::PropertyAnimation::easing.amplitude
\qmlproperty real QtQuick2::PropertyAnimation::easing.overshoot
\qmlproperty real QtQuick2::PropertyAnimation::easing.period
+ \qmlproperty list<real> QtQuick2::PropertyAnimation::easing.bezierCurve
\brief the easing curve used for the animation.
To specify an easing curve you need to specify at least the type. For some curves you can also specify
@@ -2095,6 +2096,10 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t)
\o \c Easing.OutInBounce
\o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration.
\o \inlineimage qeasingcurve-outinbounce.png
+ \row
+ \o \c Easing.Bezier
+ \o Custom easing curve defined by the easing.bezierCurve property.
+ \o
\endtable
\c easing.amplitude is only applicable for bounce and elastic curves (curves of type
@@ -2107,6 +2112,10 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t)
\c easing.period is only applicable if easing.type is: \c Easing.InElastic, \c Easing.OutElastic,
\c Easing.InOutElastic or \c Easing.OutInElastic.
+ \c easing.bezierCurve is only applicable if easing.type is: \c Easing.Bezier. This property is a list<real> containing
+ groups of three points defining a curve from 0,0 to 1,1 - control1, control2,
+ end point: [cx1, cy1, cx2, cy2, endx, endy, ...]. The last point must be 1,1.
+
See the \l {declarative/animation/easing}{easing} example for a demonstration of
the different easing settings.
*/