From 1365d2f444b8771512728e291054b43b4df15fd5 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Wed, 4 Jul 2018 01:51:02 +0300 Subject: [PATCH] improvements for hidden spacers animations --- plasmoid/package/contents/ui/ParabolicManager.qml | 7 +++++++ plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/plasmoid/package/contents/ui/ParabolicManager.qml b/plasmoid/package/contents/ui/ParabolicManager.qml index ec58d9d3a..426857a17 100644 --- a/plasmoid/package/contents/ui/ParabolicManager.qml +++ b/plasmoid/package/contents/ui/ParabolicManager.qml @@ -379,6 +379,13 @@ Item { if (hasInternalSeparator || root.showWindowsOnlyFromLaunchers) { var i = tasksModel.count - 1; + //! in case the last task is in deleting phase + var task = icList.childAtIndex(i+1); + + if (task) { + i = i + 1; + } + while (i>=0) { if (!taskIsSeparator(i) && !taskIsForcedHidden(i) ) { return i; diff --git a/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml b/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml index 74fc1169c..2a2910516 100644 --- a/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml +++ b/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml @@ -44,10 +44,10 @@ Item{ //the flag !root.inActivityChange protects from this //and it is used later on Behaviors in order to not break //the activity change animations from removal/additions of tasks + //! && !root.inActivityChange (deprecated) in order to check if it is fixed property int separatorSpace: neighbourSeparator && !isSeparator - && !(parabolicManager.hasInternalSeparator && root.dragSource) - && !root.inActivityChange ? //fix for #846 - (2+root.iconMargin/2) : 0 + && !(parabolicManager.hasInternalSeparator && root.dragSource) ? + (2+root.iconMargin/2) : 0 property bool rightSpacer: false