From 65eaf6d0b85c80517d6588a3d25263df8e87269d Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sat, 22 Apr 2017 01:39:12 +0300
Subject: [PATCH] use more the new beautiful removal anchoring

--this fixes on changing activities and desktop.
the animations are much better concerning the
launchers
---
 plasmoid/contents/ui/TaskDelegate.qml | 50 +++++++++++++++++----------
 plasmoid/contents/ui/main.qml         |  2 +-
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/plasmoid/contents/ui/TaskDelegate.qml b/plasmoid/contents/ui/TaskDelegate.qml
index f6a2e449a..cf9322217 100644
--- a/plasmoid/contents/ui/TaskDelegate.qml
+++ b/plasmoid/contents/ui/TaskDelegate.qml
@@ -557,7 +557,7 @@ MouseArea{
 
     onItemIndexChanged: {
         if (itemIndex>=0)
-            lastValidIndex = itemIndex;
+            lastValidTimer.start();
     }
 
     onIsDraggedChanged: {
@@ -711,11 +711,11 @@ MouseArea{
         ////window previews/////////
         if (isWindow) {
             if(containsMouse && root.showPreviews && Latte.WindowSystem.compositingActive){
-               // if (!windowsPreviewDlg.visible) {
-                    hoveredTimerObj = hoveredTimerComponent.createObject(mainItemContainer);
-               // } else {
-               //     mainItemContainer.preparePreviewWindow(false);
-               // }
+                // if (!windowsPreviewDlg.visible) {
+                hoveredTimerObj = hoveredTimerComponent.createObject(mainItemContainer);
+                // } else {
+                //     mainItemContainer.preparePreviewWindow(false);
+                // }
 
                 //  preparePreviewWindow();
             }
@@ -1175,8 +1175,8 @@ MouseArea{
             //Animation Add/Remove (3) - when is launcher with no window, animations enabled
             var animation2 = ((((tasksModel.launcherPosition(mainItemContainer.launcherUrl) == -1)
                                 && (tasksModel.launcherPosition(mainItemContainer.launcherUrlWithIcon) == -1) )
-                                  || !launcherIsPresent(mainItemContainer.launcherUrl))
-                                && mainItemContainer.isWindow);
+                               || !launcherIsPresent(mainItemContainer.launcherUrl))
+                              && mainItemContainer.isWindow);
 
             var animation3 = ((!root.taskExists(mainItemContainer.launcherUrl) && mainItemContainer.isLauncher));
 
@@ -1326,6 +1326,20 @@ MouseArea{
         }
     }
 
+    // when changing activities and desktops the index of the tasks
+    // is updated immediately to -1, this timer protects this indexing
+    // change in order to provide a beautiful removal tasks animation
+    Timer {
+        id: lastValidTimer
+        interval: 100 ///the interval does not follow the animations timing
+        repeat: false
+
+        onTriggered: {
+            if (mainItemContainer.itemIndex >= 0)
+                mainItemContainer.lastValidIndex = mainItemContainer.itemIndex;
+        }
+    }
+
     function launcherIsPresent(url) {
         var activities = tasksModel.launcherActivities(url);
 
@@ -1346,8 +1360,8 @@ MouseArea{
         //Animation Add/Remove (4) - the user removes a launcher, animation enabled
         property bool animation1: ((((tasksModel.launcherPosition(mainItemContainer.launcherUrl) == -1)
                                      && (tasksModel.launcherPosition(mainItemContainer.launcherUrlWithIcon) == -1) )
-                                       || !launcherIsPresent(mainItemContainer.launcherUrl))
-                                      && !mainItemContainer.isStartup)
+                                    || !launcherIsPresent(mainItemContainer.launcherUrl))
+                                   && !mainItemContainer.isStartup)
 
         property bool animation4: ((mainItemContainer.launcherUrl===root.launcherForRemoval
                                     || mainItemContainer.launcherUrlWithIcon===root.launcherForRemoval )&& mainItemContainer.isLauncher)
@@ -1369,14 +1383,12 @@ MouseArea{
 
                 //trying to fix the ListView nasty behavior
                 //during the removal the anchoring for ListView children changes a lot
-                if(taskRealRemovalAnimation.animation4){
-                    var previousTask = icList.chiltAtIndex(mainItemContainer.lastValidIndex-1);
-                    if (previousTask !== undefined){
-                        if (root.vertical) {
-                            mainItemContainer.anchors.top = previousTask.bottom;
-                        } else {
-                            mainItemContainer.anchors.left = previousTask.right;
-                        }
+                var previousTask = icList.chiltAtIndex(mainItemContainer.lastValidIndex-1);
+                if (previousTask !== undefined){
+                    if (root.vertical) {
+                        mainItemContainer.anchors.top = previousTask.bottom;
+                    } else {
+                        mainItemContainer.anchors.left = previousTask.right;
                     }
                 }
 
@@ -1394,7 +1406,7 @@ MouseArea{
             property: "opacity"
             to: 1
             duration:  mainItemContainer.inBouncingAnimation ? //exactly how much the bounche animation lasts
-                           5*(root.durationTime * 0.8 * units.longDuration) : 0
+                                                               5*(root.durationTime * 0.8 * units.longDuration) : 0
             easing.type: Easing.InQuad
         }
         //end of ghost animation
diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml
index 710923cfb..27c98e5a7 100644
--- a/plasmoid/contents/ui/main.qml
+++ b/plasmoid/contents/ui/main.qml
@@ -909,7 +909,7 @@ Item {
                 for(var i=0; i<tasks.length; ++i){
                     var task = tasks[i];
 
-                    if (task.itemIndex === position) {
+                    if (task.lastValidIndex === position) {
                         return task;
                     }
                 }