From 914925efd5b3949d4cc22c7eb63ec0c4037f8e20 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <charlesg99@outlook.com>
Date: Mon, 1 Jul 2019 21:16:59 -0400
Subject: [PATCH] Fix animation lag on isolated workspace switch with ungrouped
 apps

---
 taskbar.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/taskbar.js b/taskbar.js
index b8f5a92..4765956 100644
--- a/taskbar.js
+++ b/taskbar.js
@@ -485,11 +485,8 @@ var taskbar = Utils.defineClass({
     },
 
     handleIsolatedWorkspaceSwitch: function() {
-        if (this.isGroupApps) {
-            this._queueRedisplay();
-        } else {
-            this.resetAppIcons();
-        }
+        this._shownInitially = this.isGroupApps;
+        this._queueRedisplay();
     },
 
     _connectWorkspaceSignals: function() {
@@ -777,7 +774,7 @@ var taskbar = Utils.defineClass({
                 (appIcon.window && (this.isGroupApps || expectedAppInfos[appIndex].windows.indexOf(appIcon.window) < 0)) ||
                 (!appIcon.window && !appIcon.isLauncher && 
                  !this.isGroupApps && expectedAppInfos[appIndex].windows.length)) {
-                currentAppIcons[i].animateOutAndDestroy();
+                currentAppIcons[i][this._shownInitially ? 'animateOutAndDestroy' : 'destroy']();
                 currentAppIcons.splice(i, 1);
             }
         }