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

Merge pull request #148 from esensar/fix/147-widgets-stealing-touches 

Ensure HomeScreenGrid steals touches from widgets when folder is open
This commit is contained in:
Tibor Kaputa 2023-09-27 09:04:37 +02:00 committed by GitHub
parent 6038aac349 a091f4ff4c
commit 8bdbae498e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import android.text.TextUtils
import android.util.AttributeSet import android.util.AttributeSet
import android.util.Size import android.util.Size
import android.util.SizeF import android.util.SizeF
import android.view.MotionEvent
import android.view.View import android.view.View
import android.view.animation.DecelerateInterpolator import android.view.animation.DecelerateInterpolator
import android.view.animation.OvershootInterpolator import android.view.animation.OvershootInterpolator
@ -1511,6 +1512,14 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) : Rel
} }
} }
override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {
return if (currentlyOpenFolder != null) {
true
} else {
super.onInterceptTouchEvent(ev)
}
}
private fun Canvas.drawItemInCell(item: HomeScreenGridItem, cell: Rect) { private fun Canvas.drawItemInCell(item: HomeScreenGridItem, cell: Rect) {
if (item.id != draggedItem?.id) { if (item.id != draggedItem?.id) {
val drawableX = cell.left + iconMargin val drawableX = cell.left + iconMargin