[gnome-shell/gbsneto/icon-grid-dnd-fixes: 8/19] appDisplay: Use new moveItem API to move items

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit f674eca61e839d878f9e839ee6915625c9fef925
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Sep 23 16:53:17 2020 -0300

    appDisplay: Use new moveItem API to move items
    
    This uses the API added in the previous commit. The intent here
    is to avoid removing and readding actors when moving them around.
    
    Related: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3165
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1447

 js/ui/appDisplay.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 9094fcf038..3f2f605429 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -746,10 +746,14 @@ var BaseAppView = GObject.registerClass({
         if (page === newPage && position === newPosition)
             return;
 
-        if (page !== -1 && position !== -1)
-            this._removeItem(item);
+        // Update the _orderedItems array
+        let index = this._orderedItems.indexOf(item);
+        this._orderedItems.splice(index, 1);
 
-        this._addItem(item, newPage, newPosition);
+        index = this._getLinearPosition(newPage, newPosition);
+        this._orderedItems.splice(index, 0, item);
+
+        this._grid.moveItem(item, newPage, newPosition);
     }
 
     vfunc_allocate(box) {