From 35f53e6428d9b03ae6e38509ef6bebaa74e6b8ec Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Fri, 16 Mar 2018 09:29:27 +0200 Subject: [PATCH] animations improvements --animate tasks hidden spacers properly when a task is inAttention and the user enters the mouse at first time when the task isnt zoomed --improve tasks hidden spacers animated behaviors --improve applets hidden spacers animated behaviors --- .../contents/ui/applet/AppletHiddenSpacer.qml | 10 ++++++---- .../contents/ui/task/TaskHiddenSpacer.qml | 16 +++++++++------- .../package/contents/ui/task/TaskWrapper.qml | 8 +++++++- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/containment/package/contents/ui/applet/AppletHiddenSpacer.qml b/containment/package/contents/ui/applet/AppletHiddenSpacer.qml index f9942e51e..e8888a6fc 100644 --- a/containment/package/contents/ui/applet/AppletHiddenSpacer.qml +++ b/containment/package/contents/ui/applet/AppletHiddenSpacer.qml @@ -42,13 +42,15 @@ Item{ property real nScale: 0 - Behavior on nScale { - enabled: !root.globalDirectRender + Behavior on nHiddenSize { + id: animatedBehavior + enabled: !root.globalDirectRender || restoreAnimation.running NumberAnimation { duration: 3 * container.animationTime } } - Behavior on nScale { - enabled: root.globalDirectRender && !restoreAnimation.running + Behavior on nHiddenSize { + id: directBehavior + enabled: !animatedBehavior.running NumberAnimation { duration: root.directRenderAnimationTime } } diff --git a/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml b/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml index 776ea6879..2359e3325 100644 --- a/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml +++ b/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml @@ -47,7 +47,7 @@ Item{ property int separatorSpace: neighbourSeparator && !isSeparator && !(parabolicManager.hasInternalSeparator && root.dragSource) && !root.inActivityChange ? //fix for #846 - (2+root.iconMargin/2) : 0 + (2+root.iconMargin/2) : 0 property bool rightSpacer: false @@ -105,15 +105,17 @@ Item{ Component.onCompleted: hiddenSpacer.updateNeighbour(); - - Behavior on separatorSpace { - enabled: mainItemContainer.inFastRestoreAnimation || showWindowAnimation.running || root.inActivityChange + Behavior on nHiddenSize { + id: animatedBehavior + enabled: (mainItemContainer.inFastRestoreAnimation || showWindowAnimation.running || restoreAnimation.running + || root.inActivityChange || mainItemContainer.inRemoveStage) + || (mainItemContainer.containsMouse && inAttentionAnimation && wrapper.mScale!==root.zoomFactor) NumberAnimation{ duration: 3 * mainItemContainer.animationTime } } - Behavior on separatorSpace { - enabled: !mainItemContainer.inFastRestoreAnimation && !showWindowAnimation.running - && !restoreAnimation.running && !root.inActivityChange + Behavior on nHiddenSize { + id: directBehavior + enabled: !animatedBehavior.running NumberAnimation { duration: root.directRenderAnimationTime } } diff --git a/plasmoid/package/contents/ui/task/TaskWrapper.qml b/plasmoid/package/contents/ui/task/TaskWrapper.qml index a6d250ea6..cde04fdf9 100644 --- a/plasmoid/package/contents/ui/task/TaskWrapper.qml +++ b/plasmoid/package/contents/ui/task/TaskWrapper.qml @@ -254,8 +254,14 @@ Item{ hiddenSpacerRight.nScale = scales.rightScale - 1; } - if (!mainItemContainer.inAttentionAnimation) + if (!mainItemContainer.inAttentionAnimation) { mScale = root.zoomFactor; + } else { + var subSpacerScale = (root.zoomFactor-1)/2; + + hiddenSpacerLeft.nScale = subSpacerScale; + hiddenSpacerRight.nScale = subSpacerScale; + } mainItemContainer.scalesUpdatedOnce = false; }