Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Fix touchscreen controller being limited to touch down/up

Browse source
This commit is contained in:
Connor McLaughlin 2020-10-06 23:06:41 +10:00
parent e6ef5f1a1c
commit 4b8ae472ab
2 changed files with 59 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerButtonView.java
View file

@ -5,6 +5,7 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
@ -17,12 +18,6 @@ public class TouchscreenControllerButtonView extends View {
private boolean mPressed = false;
private int mButtonCode = -1;
private String mButtonName = "";
private ButtonStateChangedListener mListener;
public interface ButtonStateChangedListener {
void onButtonStateChanged(TouchscreenControllerButtonView view, boolean pressed);
}
public TouchscreenControllerButtonView(Context context) {
super(context);
@ -78,41 +73,12 @@ public class TouchscreenControllerButtonView extends View {
}
}
@Override
public boolean onTouchEvent(MotionEvent event) {
final boolean oldState = mPressed;
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_POINTER_DOWN: {
mPressed = true;
invalidate();
if (mListener != null && !oldState)
mListener.onButtonStateChanged(this, true);
return true;
}
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_POINTER_UP: {
mPressed = false;
invalidate();
if (mListener != null && oldState)
mListener.onButtonStateChanged(this, false);
return true;
}
}
return super.onTouchEvent(event);
}
public boolean isPressed() {
return mPressed;
}
public void setPressed(boolean pressed) { mPressed = pressed; invalidate(); }
public String getButtonName() {
return mButtonName;
}
@ -144,8 +110,4 @@ public class TouchscreenControllerButtonView extends View {
public void setUnpressedDrawable(Drawable unpressedDrawable) {
mUnpressedDrawable = unpressedDrawable;
}
public void setButtonStateChangedListener(ButtonStateChangedListener listener) {
mListener = listener;
}
}

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

@ -1,18 +1,25 @@
package com.github.stenzek.duckstation;
import android.content.Context;
import android.graphics.Rect;
import android.text.method.Touch;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.widget.FrameLayout;
import java.util.ArrayList;
import java.util.HashMap;
/**
* TODO: document your custom view class.
*/
public class TouchscreenControllerView extends FrameLayout implements TouchscreenControllerButtonView.ButtonStateChangedListener {
public class TouchscreenControllerView extends FrameLayout {
private int mControllerIndex;
private String mControllerType;
private ArrayList<TouchscreenControllerButtonView> mButtonViews = new ArrayList<>();
public TouchscreenControllerView(Context context) {
super(context);
@ -32,8 +39,12 @@ public class TouchscreenControllerView extends FrameLayout implements Touchscree
LayoutInflater inflater = LayoutInflater.from(getContext());
View view = inflater.inflate(R.layout.layout_touchscreen_controller, this, true);
view.setOnTouchListener((view1, event) -> {
return handleTouchEvent(event);
});
// TODO: Make dynamic, editable.
mButtonViews.clear();
linkButton(view, R.id.controller_button_up, "Up");
linkButton(view, R.id.controller_button_right, "Right");
linkButton(view, R.id.controller_button_down, "Down");
@ -53,24 +64,61 @@ public class TouchscreenControllerView extends FrameLayout implements Touchscree
private void linkButton(View view, int id, String buttonName) {
TouchscreenControllerButtonView buttonView = (TouchscreenControllerButtonView) view.findViewById(id);
buttonView.setButtonName(buttonName);
buttonView.setButtonStateChangedListener(this);
int code = AndroidHostInterface.getInstance().getControllerButtonCode(mControllerType, buttonName);
buttonView.setButtonCode(code);
Log.i("TouchscreenController", String.format("%s -> %d", buttonName, code));
if (code < 0) {
if (code >= 0) {
mButtonViews.add(buttonView);
} else {
Log.e("TouchscreenController", String.format("Unknown button name '%s' " +
"for '%s'", buttonName, mControllerType));
}
}
private boolean handleTouchEvent(MotionEvent event) {
switch (event.getActionMasked())
{
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_POINTER_UP:
{
clearAllButtonPressedStates();
return true;
}
@Override
public void onButtonStateChanged(TouchscreenControllerButtonView view, boolean pressed) {
if (view.getButtonCode() < 0)
return;
case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_POINTER_DOWN:
case MotionEvent.ACTION_MOVE:
{
final int x = (int)event.getX();
final int y = (int)event.getY();
Rect rect = new Rect();
for (TouchscreenControllerButtonView buttonView : mButtonViews)
{
buttonView.getHitRect(rect);
final boolean pressed = rect.contains(x, y);
if (buttonView.isPressed() == pressed)
continue;
AndroidHostInterface.getInstance().setControllerButtonState(mControllerIndex, view.getButtonCode(), pressed);
buttonView.setPressed(pressed);
AndroidHostInterface.getInstance().setControllerButtonState(mControllerIndex, buttonView.getButtonCode(), pressed);
}
return true;
}
}
return false;
}
private void clearAllButtonPressedStates() {
for (TouchscreenControllerButtonView buttonView : mButtonViews) {
if (!buttonView.isPressed())
continue;
AndroidHostInterface.getInstance().setControllerButtonState(mControllerIndex, buttonView.getButtonCode(), false);
buttonView.setPressed(false);
}
}
}