fenix
/
Simple-Launcher
mirror of https://github.com/SimpleMobileTools/Simple-Launcher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix occupied position calculation for offpage items

This commit is contained in:
Ensar Sarajčić 2023-07-18 18:25:40 +02:00
parent 9dc9e90e0e
commit f0eb1254a3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/launcher/views/HomeScreenGrid.kt
View File

@ -367,7 +367,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
}
var areAllCellsEmpty = true
gridItems.filter { it.id != draggedItem?.id }.forEach { item ->
gridItems.filter { it.id != draggedItem?.id && it.page == currentPage }.forEach { item ->
for (xCell in item.left..item.right) {
for (yCell in item.top..item.bottom) {
val cell = Pair(xCell, yCell)
@ -764,7 +764,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
}
fun isClickingGridItem(x: Int, y: Int): HomeScreenGridItem? {
for (gridItem in gridItems) {
for (gridItem in gridItems.filter { it.page == currentPage }) {
if (gridItem.type == ITEM_TYPE_ICON || gridItem.type == ITEM_TYPE_SHORTCUT) {
val rect = getClickableRect(gridItem)
if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) {