[gnome-shell/gbsneto/custom-icon-positions: 11/35] appDisplay: Accept dropping any kind of icon over it

[Florian Müllner <fmuellner src gnome org>]

commit 2bc81752190adf8f754413836175ab4a15177f4c
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue May 26 11:19:39 2020 -0300

    appDisplay: Accept dropping any kind of icon over it
    
    The grid will be able to handle them. As of now, it doesn't
    do anything with folder icons, or icons in folders.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1284

 js/ui/appDisplay.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index cbc0980824..4d2bd7879a 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -912,14 +912,8 @@ class AppDisplay extends BaseAppView {
     }
 
     _canAccept(source) {
-        if (!(source instanceof AppIcon))
-            return false;
-
-        let view = _getViewFromIcon(source);
-        if (!(view instanceof FolderView))
-            return false;
-
-        return true;
+        return (source instanceof AppIcon) ||
+            (source instanceof FolderIcon);
     }
 
     handleDragOver(source) {
@@ -934,7 +928,8 @@ class AppDisplay extends BaseAppView {
             return false;
 
         let view = _getViewFromIcon(source);
-        view.removeApp(source.app);
+        if (view instanceof FolderView)
+            view.removeApp(source.app);
 
         if (this._currentDialog)
             this._currentDialog.popdown();