From b55b14a00785e454ab5f0bc80a1bb8da4ecfd944 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Thu, 12 May 2016 17:36:57 +0900
Subject: [PATCH 1/6] Fix icon never turning visible when transitioning from
 startup.

Also stops blanking the icon while running the startup throbber, which
we used to do to hide ugly morphs from launcher to window icons, which
we no longer need to do since we default to launcher icons.

BUG:362957
---
 applets/taskmanager/package/contents/ui/Task.qml | 36 ++++++------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml
index 25ac039..2d94b0f 100644
--- a/applets/taskmanager/package/contents/ui/Task.qml
+++ b/applets/taskmanager/package/contents/ui/Task.qml
@@ -75,9 +75,6 @@ MouseArea {
     onIsStartupChanged: {
         if (!isStartup) {
             tasks.itemGeometryChanged(task, itemId);
-            busyIndicator.visible = false;
-            busyIndicator.running = false;
-            icon.visible = true;
         }
     }
 
@@ -299,19 +296,21 @@ MouseArea {
 
             anchors.fill: parent
 
-            visible: false
-
             active: task.containsMouse || task.showingContextMenu
             enabled: true
             usesPlasmaTheme: false
 
             source: model.DecorationRole
+        }
 
-            onVisibleChanged: {
-                if (visible && busyIndicator) {
-                    busyIndicator.destroy();
-                }
-            }
+        PlasmaComponents.BusyIndicator {
+            id: busyIndicator
+
+            anchors.fill: parent
+
+            visible: (model.IsStartup === true)
+
+            running: visible
         }
 
         Loader {
@@ -322,16 +321,6 @@ MouseArea {
                     && icon.visible && task.smartLauncherItem && task.smartLauncherItem.countVisible
         }
 
-        PlasmaComponents.BusyIndicator {
-            id: busyIndicator
-
-            anchors.fill: parent
-
-            visible: false
-
-            running: false
-        }
-
         states: [
             // Using a state transition avoids a binding loop between label.visible and
             // the text label margin, which derives from the icon width.
@@ -422,13 +411,6 @@ MouseArea {
     ]
 
     Component.onCompleted: {
-        if (model.IsStartup) {
-            busyIndicator.running = true;
-            busyIndicator.visible = true;
-        } else {
-            icon.visible = true;
-        }
-
         if (model.hasModelChildren) {
             var component = Qt.createComponent("GroupExpanderOverlay.qml");
             component.createObject(task);
-- 
2.7.4