Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-31 11:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Fix multi-touch for touchscreen controller

Browse source
This commit is contained in:
Connor McLaughlin 2020-10-08 18:33:04 +10:00
parent 0050c52e63
commit 51fb174984
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java
View file

@ -81,7 +81,6 @@ public class TouchscreenControllerView extends FrameLayout {
switch (event.getActionMasked())
{
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_POINTER_UP:
{
clearAllButtonPressedStates();
return true;
@ -89,15 +88,19 @@ public class TouchscreenControllerView extends FrameLayout {
case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_POINTER_DOWN:
case MotionEvent.ACTION_POINTER_UP:
case MotionEvent.ACTION_MOVE:
{
final int x = (int)event.getX();
final int y = (int)event.getY();
Rect rect = new Rect();
for (TouchscreenControllerButtonView buttonView : mButtonViews)
{
final int pointerCount = event.getPointerCount();
for (TouchscreenControllerButtonView buttonView : mButtonViews) {
buttonView.getHitRect(rect);
final boolean pressed = rect.contains(x, y);
boolean pressed = false;
for (int i = 0; i < pointerCount; i++) {
final int x = (int) event.getX(i);
final int y = (int) event.getY(i);
pressed |= rect.contains(x, y);
}
if (buttonView.isPressed() == pressed)
continue;