From 2957c50dd0f97da01dee21a2afdbb62047391e3b Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Mon, 5 Feb 2018 14:47:09 +0200 Subject: [PATCH] Revert "update zoom-in animation type" This reverts commit cc6779d0c4d84353efa85aee238950b63c8f760f. --- .../package/contents/ui/applet/AppletHiddenSpacer.qml | 5 +---- containment/package/contents/ui/applet/AppletItemWrapper.qml | 5 +---- plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml | 5 +---- plasmoid/package/contents/ui/task/TaskWrapper.qml | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/containment/package/contents/ui/applet/AppletHiddenSpacer.qml b/containment/package/contents/ui/applet/AppletHiddenSpacer.qml index 3fa55b29d..76242f28a 100644 --- a/containment/package/contents/ui/applet/AppletHiddenSpacer.qml +++ b/containment/package/contents/ui/applet/AppletHiddenSpacer.qml @@ -44,10 +44,7 @@ Item{ Behavior on nScale { enabled: !root.globalDirectRender - NumberAnimation { - duration: 4 * container.animationTime; - easing.type: Easing.OutCubic - } + NumberAnimation { duration: 3*container.animationTime } } Behavior on nScale { diff --git a/containment/package/contents/ui/applet/AppletItemWrapper.qml b/containment/package/contents/ui/applet/AppletItemWrapper.qml index 21e1a9d37..4d30609c5 100644 --- a/containment/package/contents/ui/applet/AppletItemWrapper.qml +++ b/containment/package/contents/ui/applet/AppletItemWrapper.qml @@ -609,10 +609,7 @@ Item{ Behavior on zoomScale { enabled: !root.globalDirectRender - NumberAnimation { - duration: 4 * container.animationTime; - easing.type: Easing.OutCubic - } + NumberAnimation { duration: 3*container.animationTime } } Behavior on zoomScale { diff --git a/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml b/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml index 0f6b98beb..48c9a9b00 100644 --- a/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml +++ b/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml @@ -98,10 +98,7 @@ Item{ Behavior on separatorSpace { enabled: mainItemContainer.inFastRestoreAnimation || showWindowAnimation.running - NumberAnimation { - duration: 4 * mainItemContainer.animationTime; - easing.type: Easing.OutCubic - } + NumberAnimation { duration: 3 * mainItemContainer.animationTime } } Behavior on separatorSpace { diff --git a/plasmoid/package/contents/ui/task/TaskWrapper.qml b/plasmoid/package/contents/ui/task/TaskWrapper.qml index 36b388f72..b1f62ccd3 100644 --- a/plasmoid/package/contents/ui/task/TaskWrapper.qml +++ b/plasmoid/package/contents/ui/task/TaskWrapper.qml @@ -118,10 +118,7 @@ Item{ Behavior on mScale { enabled: !root.globalDirectRender || inMimicParabolicAnimation - NumberAnimation { - duration: 4 * mainItemContainer.animationTime; - easing.type: Easing.OutCubic - } + NumberAnimation { duration: 3 * mainItemContainer.animationTime } } Behavior on mScale {