From 62bf03d0fc270ea793ef5ba3b57590c2482eaad0 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Fri, 21 Apr 2017 20:09:26 +0300
Subject: [PATCH] protecting more the scaling signaling

---
 plasmoid/contents/ui/TaskDelegate.qml | 8 +++++---
 plasmoid/contents/ui/main.qml         | 7 ++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/plasmoid/contents/ui/TaskDelegate.qml b/plasmoid/contents/ui/TaskDelegate.qml
index 52e8d76c8..2bba91985 100644
--- a/plasmoid/contents/ui/TaskDelegate.qml
+++ b/plasmoid/contents/ui/TaskDelegate.qml
@@ -432,7 +432,7 @@ MouseArea{
 
             function signalUpdateScale(nIndex, nScale, step){
                 //if ((index === nIndex)&&(!mainItemContainer.inAnimation)){
-                if ((index === nIndex)&&(mainItemContainer.hoverEnabled)){
+                if ((index === nIndex)&&(mainItemContainer.hoverEnabled)&&(waitingLaunchers.length===0)){
                     if(nScale >= 0) {
                         mScale = nScale + step;
                     } else {
@@ -591,7 +591,7 @@ MouseArea{
 
         checkListHovered.stop();
 
-        if((!inAnimation)&&(root.dragSource == null)&&(!root.taskInAnimation)){
+        if((!inAnimation)&&(root.dragSource == null)&&(!root.taskInAnimation) && hoverEnabled){
             icList.hoveredIndex = index;
             mouseEntered = true;
             root.mouseWasEntered(index-2, false);
@@ -632,7 +632,7 @@ MouseArea{
     onPositionChanged: {
         checkListHovered.stop();
 
-        if((inAnimation == false)&&(!root.taskInAnimation)&&(!root.disableRestoreZoom)){
+        if((inAnimation == false)&&(!root.taskInAnimation)&&(!root.disableRestoreZoom) && hoverEnabled){
             if(root.dragSource == null){
                 if (icList.orientation == Qt.Horizontal){
                     var step = Math.abs(icList.currentSpot-mouse.x);
@@ -1024,6 +1024,7 @@ MouseArea{
 
     function slotWaitingLauncherRemoved(launch) {
         if ((isWindow || isStartup) && !visible && launch === launcherUrl) {
+            wrapper.mScale = 1;
             visible = true;
         }
     }
@@ -1424,6 +1425,7 @@ MouseArea{
 
                 //send signal that the launcher is really removing
                 if (mainItemContainer.inBouncingAnimation) {
+                    mainItemContainer.visible = false;
                     root.removeWaitingLauncher(mainItemContainer.launcherUrl);
                 }
             }
diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml
index 7fd6f4765..6ecfa3d2d 100644
--- a/plasmoid/contents/ui/main.qml
+++ b/plasmoid/contents/ui/main.qml
@@ -930,7 +930,12 @@ Item {
     Timer {
         id: enableDirectRenderTimer
         interval: 4 * root.durationTime * units.shortDuration
-        onTriggered: icList.directRender = true;
+        onTriggered: {
+            if (waitingLaunchers.length > 0)
+                restart();
+            else
+                icList.directRender = true;
+        }
     }
 
     ///REMOVE