From f8fccf94444c7cfbb782bc8d3f7a37c4f8a98693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Thu, 21 Sep 2023 14:01:50 +0200
Subject: [PATCH] Properly shift folder items when removing items from folder

---
 .../com/simplemobiletools/launcher/views/HomeScreenGrid.kt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt
index 2b52cc8..6b398f8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt
@@ -242,6 +242,13 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
         ensureBackgroundThread {
             if (item.id != null) {
                 context.homeScreenGridItemsDB.deleteById(item.id!!)
+                if (item.parentId != null) {
+                    gridItems.filter { it.parentId == item.parentId && it.left > item.left && it.id != item.id }.forEach {
+                        it.left -= 1
+                    }
+
+                    context.homeScreenGridItemsDB.shiftFolderItems(item.parentId!!, item.left, -1, item.id)
+                }
             }
 
             if (item.type == ITEM_TYPE_WIDGET) {