diff --git a/autotests/integration/effects/scripted_effects_test.cpp b/autotests/integration/effects/scripted_effects_test.cpp --- a/autotests/integration/effects/scripted_effects_test.cpp +++ b/autotests/integration/effects/scripted_effects_test.cpp @@ -306,7 +306,7 @@ QCOMPARE(animationsForWindow[0].timeLine.duration(), 100ms); QCOMPARE(animationsForWindow[0].to, FPx2(1.4)); QCOMPARE(animationsForWindow[0].attribute, AnimationEffect::Scale); - QCOMPARE(animationsForWindow[0].timeLine.easingCurve().type(), QEasingCurve::OutQuad); + QCOMPARE(animationsForWindow[0].timeLine.easingCurve().type(), QEasingCurve::OutCubic); QCOMPARE(animationsForWindow[0].terminationFlags, AnimationEffect::TerminateAtSource | AnimationEffect::TerminateAtTarget); diff --git a/autotests/integration/effects/scripts/animationTest.js b/autotests/integration/effects/scripts/animationTest.js --- a/autotests/integration/effects/scripts/animationTest.js +++ b/autotests/integration/effects/scripts/animationTest.js @@ -1,5 +1,5 @@ effects.windowAdded.connect(function(w) { - w.anim1 = effect.animate(w, Effect.Scale, 100, 1.4, 0.2, 0, QEasingCurve.OutQuad); + w.anim1 = effect.animate(w, Effect.Scale, 100, 1.4, 0.2, 0, QEasingCurve.OutCubic); sendTestResponse(typeof(w.anim1) == "number"); }); diff --git a/autotests/integration/effects/scripts/animationTestMulti.js b/autotests/integration/effects/scripts/animationTestMulti.js --- a/autotests/integration/effects/scripts/animationTestMulti.js +++ b/autotests/integration/effects/scripts/animationTestMulti.js @@ -5,10 +5,10 @@ animations: [{ type: Effect.Scale, to: 1.4, - curve: QEasingCurve.OutQuad + curve: QEasingCurve.OutCubic }, { type: Effect.Opacity, - curve: QEasingCurve.OutQuad, + curve: QEasingCurve.OutCubic, to: 0.0 }] }); diff --git a/effects/slidingpopups/slidingpopups.cpp b/effects/slidingpopups/slidingpopups.cpp --- a/effects/slidingpopups/slidingpopups.cpp +++ b/effects/slidingpopups/slidingpopups.cpp @@ -464,7 +464,7 @@ animation.kind = AnimationKind::In; animation.timeLine.setDirection(TimeLine::Forward); animation.timeLine.setDuration((*dataIt).slideInDuration); - animation.timeLine.setEasingCurve(QEasingCurve::OutQuad); + animation.timeLine.setEasingCurve(QEasingCurve::OutCubic); // If the opposite animation (Out) was active and it had shorter duration, // at this point, the timeline can end up in the "done" state. Thus, we have @@ -503,8 +503,8 @@ animation.kind = AnimationKind::Out; animation.timeLine.setDirection(TimeLine::Backward); animation.timeLine.setDuration((*dataIt).slideOutDuration); - // this is effectively InQuad because the direction is reversed - animation.timeLine.setEasingCurve(QEasingCurve::OutQuad); + // this is effectively InCubic because the direction is reversed + animation.timeLine.setEasingCurve(QEasingCurve::OutCubic); // If the opposite animation (In) was active and it had shorter duration, // at this point, the timeline can end up in the "done" state. Thus, we have diff --git a/effects/windowaperture/package/contents/code/main.js b/effects/windowaperture/package/contents/code/main.js --- a/effects/windowaperture/package/contents/code/main.js +++ b/effects/windowaperture/package/contents/code/main.js @@ -162,7 +162,7 @@ w.offToCornerId = set({ window: w, duration: badBadWindowsEffect.duration, - curve: QEasingCurve.InOutQuad, + curve: QEasingCurve.InOutCubic, animations: [{ type: Effect.Position, targetAnchor: anchor, @@ -180,7 +180,7 @@ animate({ window: w, duration: badBadWindowsEffect.duration, - curve: QEasingCurve.InOutQuad, + curve: QEasingCurve.InOutCubic, animations: [{ type: Effect.Position, sourceAnchor: anchor, diff --git a/libkwineffects/kwineffects.h b/libkwineffects/kwineffects.h --- a/libkwineffects/kwineffects.h +++ b/libkwineffects/kwineffects.h @@ -3684,7 +3684,7 @@ /** * Sets new easing curve by providing its type. * - * @param type Type of the easing curve(e.g. QEasingCurve::InQuad, etc) + * @param type Type of the easing curve(e.g. QEasingCurve::InCubic, etc) * @see easingCurve * @since 5.14 */ diff --git a/onscreennotification.cpp b/onscreennotification.cpp --- a/onscreennotification.cpp +++ b/onscreennotification.cpp @@ -210,7 +210,7 @@ m_animation->setStartValue(1.0); m_animation->setEndValue(0.0); m_animation->setDuration(250); - m_animation->setEasingCurve(QEasingCurve::InOutQuad); + m_animation->setEasingCurve(QEasingCurve::InOutCubic); } } } diff --git a/qml/outline/plasma/outline.qml b/qml/outline/plasma/outline.qml --- a/qml/outline/plasma/outline.qml +++ b/qml/outline/plasma/outline.qml @@ -116,19 +116,19 @@ } Behavior on x { - NumberAnimation { duration: window.animationDuration; easing.type: Easing.InOutQuad; } + NumberAnimation { duration: window.animationDuration; easing.type: Easing.InOutCubic; } enabled: window.animationEnabled } Behavior on y { - NumberAnimation { duration: window.animationDuration; easing.type: Easing.InOutQuad; } + NumberAnimation { duration: window.animationDuration; easing.type: Easing.InOutCubic; } enabled: window.animationEnabled } Behavior on width { - NumberAnimation { duration: window.animationDuration; easing.type: Easing.InOutQuad; } + NumberAnimation { duration: window.animationDuration; easing.type: Easing.InOutCubic; } enabled: window.animationEnabled } Behavior on height { - NumberAnimation { duration: window.animationDuration; easing.type: Easing.InOutQuad; } + NumberAnimation { duration: window.animationDuration; easing.type: Easing.InOutCubic; } enabled: window.animationEnabled } }