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

adding collision checks at bottom resizing too

This commit is contained in:
tibbi 2022-10-04 23:09:51 +02:00
parent dccad9ef90
commit f572abcf84
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/kotlin/com/simplemobiletools/launcher/views/MyAppWidgetResizeFrame.kt
View File

@ -203,11 +203,28 @@ class MyAppWidgetResizeFrame(context: Context, attrs: AttributeSet, defStyle: In
} }
DRAGGING_BOTTOM -> { DRAGGING_BOTTOM -> {
val newHeight = event.rawY.toInt() - frameRect.top val newHeight = event.rawY.toInt() - frameRect.top
if (newHeight >= minHeight) { val wantedBottom = if (newHeight >= minHeight) {
frameRect.bottom = event.rawY.toInt() event.rawY.toInt()
} else { } else {
frameRect.bottom = frameRect.top + minHeight frameRect.top + minHeight
} }
val closestCellY = roundToClosestMultiplyOfNumber(wantedBottom - sideMargins.top, cellHeight) / cellHeight - 1
var areAllCellsFree = true
for (xCell in cellsRect.left until cellsRect.right) {
for (yCell in cellsRect.top until closestCellY + 1) {
if (occupiedCells.contains(Pair(xCell, yCell))) {
areAllCellsFree = false
}
}
}
if (areAllCellsFree && cellsRect.bottom != closestCellY) {
cellsRect.bottom = closestCellY
cellChanged()
}
frameRect.bottom = wantedBottom
} }
} }
@ -280,7 +297,25 @@ class MyAppWidgetResizeFrame(context: Context, attrs: AttributeSet, defStyle: In
frameRect.right = (cellsRect.right + 1) * cellWidth + sideMargins.left frameRect.right = (cellsRect.right + 1) * cellWidth + sideMargins.left
} }
} }
DRAGGING_BOTTOM -> frameRect.bottom = roundToClosestMultiplyOfNumber(frameRect.bottom - sideMargins.top, cellHeight) + sideMargins.top DRAGGING_BOTTOM -> {
val wantedBottom = roundToClosestMultiplyOfNumber(frameRect.bottom - sideMargins.top, cellHeight)
val wantedBottomCellY = wantedBottom / cellHeight - 1
var areAllCellsFree = true
for (xCell in cellsRect.left until cellsRect.right) {
for (yCell in cellsRect.top until wantedBottomCellY + 1) {
if (occupiedCells.contains(Pair(xCell, yCell))) {
areAllCellsFree = false
}
}
}
if (areAllCellsFree) {
frameRect.bottom = wantedBottom + sideMargins.top
cellsRect.bottom = wantedBottomCellY
} else {
frameRect.bottom = (cellsRect.bottom + 1) * cellHeight + sideMargins.top
}
}
} }
redrawFrame() redrawFrame()
} }