diff --git a/src/effects/desktopgrid/desktopgrideffect.cpp b/src/effects/desktopgrid/desktopgrideffect.cpp index af06cea2b0..4cf321cb49 100644 --- a/src/effects/desktopgrid/desktopgrideffect.cpp +++ b/src/effects/desktopgrid/desktopgrideffect.cpp @@ -98,7 +98,7 @@ void DesktopGridEffect::reconfigure(ReconfigureFlags) { DesktopGridConfig::self()->read(); setLayout(DesktopGridConfig::layoutMode()); - setAnimationDuration(animationTime(200)); + setAnimationDuration(animationTime(400)); for (const ElectricBorder &border : qAsConst(m_borderActivate)) { effects->unreserveElectricBorder(border, this); diff --git a/src/effects/desktopgrid/desktopgrideffect.h b/src/effects/desktopgrid/desktopgrideffect.h index cdf921d6b0..b680c2530f 100644 --- a/src/effects/desktopgrid/desktopgrideffect.h +++ b/src/effects/desktopgrid/desktopgrideffect.h @@ -108,7 +108,7 @@ private: QList m_borderActivate; QList m_touchBorderActivate; Status m_status = Status::Inactive; - int m_animationDuration = 200; + int m_animationDuration = 400; int m_layout = 1; bool m_gestureInProgress = false; }; diff --git a/src/effects/desktopgrid/qml/DesktopView.qml b/src/effects/desktopgrid/qml/DesktopView.qml index 5565cc3c1e..d2c32946a4 100644 --- a/src/effects/desktopgrid/qml/DesktopView.qml +++ b/src/effects/desktopgrid/qml/DesktopView.qml @@ -138,7 +138,7 @@ FocusScope { XAnimator { id: xAnim duration: container.effect.animationDuration - easing.type: Easing.InOutCubic + easing.type: Easing.OutCubic } } Behavior on y { @@ -146,7 +146,7 @@ FocusScope { YAnimator { id: yAnim duration: container.effect.animationDuration - easing.type: Easing.InOutCubic + easing.type: Easing.OutCubic } } } diff --git a/src/effects/desktopgrid/qml/main.qml b/src/effects/desktopgrid/qml/main.qml index e2deb30ab7..3e1bc7c147 100644 --- a/src/effects/desktopgrid/qml/main.qml +++ b/src/effects/desktopgrid/qml/main.qml @@ -161,28 +161,28 @@ Rectangle { enabled: !container.effect.gestureInProgress NumberAnimation { duration: container.effect.animationDuration - easing.type: Easing.InOutCubic + easing.type: Easing.OutCubic } } Behavior on y { enabled: !container.effect.gestureInProgress NumberAnimation { duration: container.effect.animationDuration - easing.type: Easing.InOutCubic + easing.type: Easing.OutCubic } } Behavior on scale { enabled: !container.effect.gestureInProgress NumberAnimation { duration: container.effect.animationDuration - easing.type: Easing.InOutCubic + easing.type: Easing.OutCubic } } Behavior on panelOpacity { enabled: !container.effect.gestureInProgress NumberAnimation { duration: container.effect.animationDuration - easing.type: Easing.InOutCubic + easing.type: Easing.OutCubic } } @@ -304,7 +304,7 @@ Rectangle { enabled: !container.effect.gestureInProgress NumberAnimation { duration: container.effect.animationDuration - easing.type: Easing.InOutCubic + easing.type: Easing.OutCubic } } } diff --git a/src/effects/overview/overvieweffect.cpp b/src/effects/overview/overvieweffect.cpp index fc8ea4d51c..acb2b13da2 100644 --- a/src/effects/overview/overvieweffect.cpp +++ b/src/effects/overview/overvieweffect.cpp @@ -93,7 +93,7 @@ void OverviewEffect::reconfigure(ReconfigureFlags) { OverviewConfig::self()->read(); setLayout(OverviewConfig::layoutMode()); - setAnimationDuration(animationTime(200)); + setAnimationDuration(animationTime(400)); setBlurBackground(OverviewConfig::blurBackground()); for (const ElectricBorder &border : qAsConst(m_borderActivate)) { diff --git a/src/effects/overview/overvieweffect.h b/src/effects/overview/overvieweffect.h index 5140de2015..a9bd0351b4 100644 --- a/src/effects/overview/overvieweffect.h +++ b/src/effects/overview/overvieweffect.h @@ -87,7 +87,7 @@ private: qreal m_partialActivationFactor = 0; bool m_blurBackground = false; Status m_status = Status::Inactive; - int m_animationDuration = 200; + int m_animationDuration = 400; int m_layout = 1; bool m_gestureInProgress = false; }; diff --git a/src/effects/private/qml/WindowHeapDelegate.qml b/src/effects/private/qml/WindowHeapDelegate.qml index 4f19cc95aa..0d9548f960 100644 --- a/src/effects/private/qml/WindowHeapDelegate.qml +++ b/src/effects/private/qml/WindowHeapDelegate.qml @@ -274,7 +274,7 @@ Item { NumberAnimation { duration: thumb.windowHeap.animationDuration properties: "x, y, width, height, opacity" - easing.type: Easing.InOutCubic + easing.type: Easing.OutCubic } } diff --git a/src/effects/windowview/qml/main.qml b/src/effects/windowview/qml/main.qml index 72de412053..65a2e6ff40 100644 --- a/src/effects/windowview/qml/main.qml +++ b/src/effects/windowview/qml/main.qml @@ -23,8 +23,6 @@ Item { property bool animationEnabled: false property bool organized: false - readonly property int animationDuration: PlasmaCore.Units.longDuration - function start() { animationEnabled = true; organized = true; @@ -34,7 +32,7 @@ Item { organized = false; } - Keys.onEscapePressed: effect.deactivate(animationDuration); + Keys.onEscapePressed: effect.deactivate(container.effect.animationDuration); Keys.priority: Keys.AfterItem Keys.forwardTo: searchField @@ -72,7 +70,7 @@ Item { layer.effect: FastBlur { radius: container.organized ? 64 : 0 Behavior on radius { - NumberAnimation { duration: container.animationDuration; easing.type: Easing.OutCubic } + NumberAnimation { duration: container.effect.animationDuration; easing.type: Easing.OutCubic } } } } @@ -83,11 +81,11 @@ Item { opacity: container.organized ? 0.75 : 0 TapHandler { - onTapped: effect.deactivate(animationDuration); + onTapped: effect.deactivate(container.effect.animationDuration); } Behavior on opacity { - OpacityAnimator { duration: animationDuration; easing.type: Easing.OutCubic } + OpacityAnimator { duration: container.effect.animationDuration; easing.type: Easing.OutCubic } } } @@ -143,7 +141,7 @@ Item { Layout.fillHeight: true focus: true padding: PlasmaCore.Units.largeSpacing - animationDuration: container.animationDuration + animationDuration: container.effect.animationDuration animationEnabled: container.animationEnabled organized: container.organized showOnly: { @@ -186,7 +184,7 @@ Item { opacity: 1 - downGestureProgress onDownGestureTriggered: client.closeWindow() } - onActivated: effect.deactivate(animationDuration); + onActivated: effect.deactivate(container.effect.animationDuration); } } PlasmaExtras.PlaceholderMessage { @@ -214,7 +212,7 @@ Item { opacity: (model.client.hidden || container.organized) ? 0 : 1 Behavior on opacity { - NumberAnimation { duration: animationDuration; easing.type: Easing.OutCubic } + NumberAnimation { duration: container.effect.animationDuration; easing.type: Easing.OutCubic } } } } diff --git a/src/effects/windowview/windowvieweffect.cpp b/src/effects/windowview/windowvieweffect.cpp index 855ac544db..1d29e081ad 100644 --- a/src/effects/windowview/windowvieweffect.cpp +++ b/src/effects/windowview/windowvieweffect.cpp @@ -185,7 +185,7 @@ int WindowViewEffect::requestedEffectChainPosition() const void WindowViewEffect::reconfigure(ReconfigureFlags) { WindowViewConfig::self()->read(); - setAnimationDuration(animationTime(200)); + setAnimationDuration(animationTime(400)); setLayout(WindowViewConfig::layoutMode()); for (ElectricBorder border : qAsConst(m_borderActivate)) { diff --git a/src/effects/windowview/windowvieweffect.h b/src/effects/windowview/windowvieweffect.h index 124ade3e43..1295bfd3b9 100644 --- a/src/effects/windowview/windowvieweffect.h +++ b/src/effects/windowview/windowvieweffect.h @@ -120,7 +120,7 @@ private: Status m_status = Status::Inactive; qreal m_partialActivationFactor = 0; PresentWindowsMode m_mode; - int m_animationDuration = 200; + int m_animationDuration = 400; int m_layout = 1; bool m_gestureInProgress = false; };