fenix/Simple-Launcher
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Launcher.git synced 2025-06-05 13:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

make sure cell sizes are filled out before checking clicks

Browse Source
This commit is contained in:
tibbi 2022-10-09 09:31:36 +02:00
parent 2a4a8fd623
commit f85b7f911f
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,22 +507,7 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
override fun onDraw(canvas: Canvas) { override fun onDraw(canvas: Canvas) {
super.onDraw(canvas) super.onDraw(canvas)
if (cellXCoords.isEmpty()) { if (cellXCoords.isEmpty()) {
cellWidth = getFakeWidth() / COLUMN_COUNT fillCellSizes()
cellHeight = getFakeHeight() / ROW_COUNT
iconSize = cellWidth - 2 * iconMargin
for (i in 0 until COLUMN_COUNT) {
cellXCoords.add(i, i * cellWidth)
}
for (i in 0 until ROW_COUNT) {
cellYCoords.add(i, i * cellHeight)
}
cellXCoords.forEach { x ->
cellYCoords.forEach { y ->
gridCenters.add(Pair(x + cellWidth / 2, y + cellHeight / 2))
}
}
} }
gridItems.filter { it.drawable != null && it.type == ITEM_TYPE_ICON || it.type == ITEM_TYPE_SHORTCUT }.forEach { item -> gridItems.filter { it.drawable != null && it.type == ITEM_TYPE_ICON || it.type == ITEM_TYPE_SHORTCUT }.forEach { item ->
@ -625,6 +610,25 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
isFirstDraw = false isFirstDraw = false
} }
private fun fillCellSizes() {
cellWidth = getFakeWidth() / COLUMN_COUNT
cellHeight = getFakeHeight() / ROW_COUNT
iconSize = cellWidth - 2 * iconMargin
for (i in 0 until COLUMN_COUNT) {
cellXCoords.add(i, i * cellWidth)
}
for (i in 0 until ROW_COUNT) {
cellYCoords.add(i, i * cellHeight)
}
cellXCoords.forEach { x ->
cellYCoords.forEach { y ->
gridCenters.add(Pair(x + cellWidth / 2, y + cellHeight / 2))
}
}
}
fun fragmentExpanded() { fun fragmentExpanded() {
widgetViews.forEach { widgetViews.forEach {
it.ignoreTouches = true it.ignoreTouches = true
@ -639,6 +643,10 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
// get the clickable area around the icon, it includes text too // get the clickable area around the icon, it includes text too
private fun getClickableRect(item: HomeScreenGridItem): Rect { private fun getClickableRect(item: HomeScreenGridItem): Rect {
if (cellXCoords.isEmpty()) {
fillCellSizes()
}
val clickableLeft = item.left * cellWidth + sideMargins.left val clickableLeft = item.left * cellWidth + sideMargins.left
val clickableTop = cellYCoords[item.top] + iconSize / 3 + sideMargins.top val clickableTop = cellYCoords[item.top] + iconSize / 3 + sideMargins.top
return Rect(clickableLeft, clickableTop, clickableLeft + cellWidth, clickableTop + iconSize * 2) return Rect(clickableLeft, clickableTop, clickableLeft + cellWidth, clickableTop + iconSize * 2)