From ec5f402cfd0bc439cd373ca8c99c59cb11556966 Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Wed, 30 Jul 2014 08:24:49 +0200 Subject: QEasingCurve: The setting order of properties should not matter. Previously, this failed because QEasingCurveFunction only had a linear behavior. The fix is to change that and let QEasingCurveFunction handle any of the simple "non-parametric easing" functions. Task-number: QTBUG-38686 Change-Id: I666d59e10ceb589dcc52956b16a6f0c259aebdad Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira --- src/corelib/tools/qeasingcurve.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/corelib/tools/qeasingcurve.cpp') diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index 12adc5a433..91a726d785 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -373,9 +373,12 @@ public: }; +static QEasingCurve::EasingFunction curveToFunc(QEasingCurve::Type curve); + qreal QEasingCurveFunction::value(qreal t) { - return t; + QEasingCurve::EasingFunction func = curveToFunc(_t); + return func(t); } QEasingCurveFunction *QEasingCurveFunction::copy() const -- cgit v1.2.3