Merge lp:~fboucault/ubuntu-ui-toolkit/workaround_easing_bug into lp:ubuntu-ui-toolkit

Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 617
Merged at revision: 618
Proposed branch: lp:~fboucault/ubuntu-ui-toolkit/workaround_easing_bug
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 21 lines (+3/-7)
1 file modified
modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp (+3/-7)
To merge this branch: bzr merge lp:~fboucault/ubuntu-ui-toolkit/workaround_easing_bug
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Olivier Tilloy (community) Approve
Review via email: mp+174223@code.launchpad.net

Commit message

Reverted standard easings to Quad because it seems QEasingCurve::BezierSpline does not ensure the target value is always reached.

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks good to me.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp'
2--- modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp 2013-07-10 17:34:20 +0000
3+++ modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp 2013-07-11 15:15:39 +0000
4@@ -53,14 +53,10 @@
5 */
6
7 UCUbuntuAnimation::UCUbuntuAnimation(QObject *parent) :
8- QObject(parent)
9+ QObject(parent),
10+ m_standardEasing(QEasingCurve::OutQuad),
11+ m_StandardEasingReverse(QEasingCurve::InQuad)
12 {
13- m_standardEasing.setType(QEasingCurve::BezierSpline);
14- m_standardEasing.addCubicBezierSegment(QPointF(0.2, 0.0), QPointF(0.4, 1.0),
15- QPointF(1.0, 1.0));
16- m_StandardEasingReverse.setType(QEasingCurve::BezierSpline);
17- m_StandardEasingReverse.addCubicBezierSegment(QPointF(0.6, 0.0), QPointF(0.8, 1.0),
18- QPointF(1.0, 1.0));
19 }
20
21 /*!

Subscribers

People subscribed via source and target branches

to status/vote changes: