diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt index 31dd01fde1..e14ac7ccc7 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt @@ -520,7 +520,7 @@ class OnScreenControls(context: Context, private val pad: PadBridge?, private va return controls.filter { val dx = x - it.cx val dy = y - it.cy - val reach = it.radius * 1.4f + val reach = it.radius * 1.4f * sqrt(1.5f) it.stick >= 0 && isVisible(it) && it.pressedBy == -1 && dx * dx + dy * dy <= reach * reach }.minByOrNull { val dx = x - it.cx diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt index f82ccd7863..1064ab2b8e 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.input +import kotlin.math.sqrt import android.content.Context import android.graphics.Bitmap import android.graphics.Canvas @@ -120,7 +121,7 @@ class OnScreenControlsTest { val left = control("ls") val x = value(left, "cx") val y = value(left, "cy") - val reach = value(left, "radius") * 1.4f + val reach = value(left, "radius") * 1.4f * sqrt(1.5f) assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (x to y - reach - 1f))) assertTrue(touch(MotionEvent.ACTION_DOWN, 1 to (x to y - reach + 1f))) assertEquals(y - reach + 1f, value(left, "ay"), 0.001f)