ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1831 from PookaMustard/master 

QoL changes for Touch Gliding
This commit is contained in:
Connor McLaughlin 2021-03-18 13:00:30 +10:00 committed by GitHub
parent db1c24d6b0 20f7cd7217
commit bad87f75cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java
View File

@ -461,10 +461,11 @@ public class TouchscreenControllerView extends FrameLayout {
final int y = (int) event.getY(i);
if (rect.contains(x, y)) {
buttonView.setPressed(true);
int pointerID = event.getPointerId(i);
if (!mGlidePairs.containsKey(pointerID) && !mGlidePairs.containsValue(buttonView)) {
final int pointerId = event.getPointerId(i);
if (!mGlidePairs.containsKey(pointerId) && !mGlidePairs.containsValue(buttonView)) {
if (buttonView.getIsGlidable())
mGlidePairs.put(pointerID, buttonView);
mGlidePairs.put(pointerId, buttonView);
else { mGlidePairs.put(pointerId, null); }
}
pressed = true;
break;
@ -493,6 +494,7 @@ public class TouchscreenControllerView extends FrameLayout {
(axisView.isPressed() && axisView.getPointerId() == pointerId)) {
axisView.setPressed(pointerId, x, y);
pressed = true;
mGlidePairs.put(pointerId, null);
break;
}
}
@ -525,9 +527,9 @@ public class TouchscreenControllerView extends FrameLayout {
case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_POINTER_DOWN:
case MotionEvent.ACTION_POINTER_UP: {
int pointerID = event.getPointerId(event.getActionIndex());
if (mGlidePairs.containsKey(pointerID))
mGlidePairs.remove(pointerID);
final int pointerId = event.getPointerId(event.getActionIndex());
if (mGlidePairs.containsKey(pointerId))
mGlidePairs.remove(pointerId);
return updateTouchButtonsFromEvent(event);
}