From 1dfec560d5df08424e052d9b7d2a88f29312ddb8 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <charlesg99@outlook.com>
Date: Mon, 12 Nov 2018 13:01:00 -0500
Subject: [PATCH] Adjust drag and drop to work with ungrouped+launchers

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

diff --git a/taskbar.js b/taskbar.js
index 3e4bd43..1d666bb 100644
--- a/taskbar.js
+++ b/taskbar.js
@@ -953,6 +953,7 @@ var taskbar = new Lang.Class({
 
         let appIcons = this._getAppIcons();
         let sourceIndex = appIcons.indexOf(source);
+        let usingLaunchers = !this.isGroupApps && this._dtpSettings.get_boolean('group-apps-use-launchers');
 
         // dragging the icon to its original position
         if (this._dragInfo[0] === sourceIndex) {
@@ -985,11 +986,16 @@ var taskbar = new Lang.Class({
         }
 
         for (let i = 0, l = appIcons.length; i < l; ++i) {
-            let windows = appIcons[i].window ? [appIcons[i].window] : getAppWindows(appIcons[i].app);
+            let windows = [];
+            
+            if (!usingLaunchers || (!source.isLauncher && !appIcons[i].isLauncher)) {
+                windows = appIcons[i].window ? [appIcons[i].window] : getAppWindows(appIcons[i].app);
+            }
 
             windows.forEach(w => w._dtpPosition = position++);
 
-            if (appFavorites.isFavorite(appIcons[i].app.get_id())) {
+            if ((usingLaunchers && appIcons[i].isLauncher) || 
+                (!usingLaunchers && appFavorites.isFavorite(appIcons[i].app.get_id()))) {
                 ++favoritesCount;
             }
         }
@@ -1000,7 +1006,7 @@ var taskbar = new Lang.Class({
             } else {
                 appFavorites.addFavoriteAtPos(sourceAppId, favoriteIndex);
             }
-        } else if (appIsFavorite) {
+        } else if (appIsFavorite && (!usingLaunchers || source.isLauncher)) {
             appFavorites.removeFavorite(sourceAppId);
         }