mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-04-19 00:56:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Change again how swipeable control are handled

Browse Source
This commit is contained in:
Mathias-Boulay
2023-03-05 18:09:49 +01:00
parent 934161a203
commit 17d64faf29
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java
View File

@@ -302,18 +302,33 @@ public class ControlLayout extends FrameLayout {
int[] location = new int[2];
//While this is called onTouch, this should only be called from a ControlButton.
public boolean onTouch(View v, MotionEvent ev) {
ControlInterface lastControlButton = mapTable.get(v);
//Check if the action is cancelling, reset the lastControl button associated to the view
if(ev.getActionMasked() == MotionEvent.ACTION_UP || ev.getActionMasked() == MotionEvent.ACTION_CANCEL){
for(ControlInterface control : mapTable.values()){
control.sendKeyPresses(false);
}
mapTable.clear();
if(lastControlButton != null) lastControlButton.sendKeyPresses(false);
mapTable.put(v, null);
return true;
}
if(ev.getActionMasked() != MotionEvent.ACTION_MOVE) return false;
getLocationOnScreen(location);
//Optimization pass to avoid looking at all children again
if(lastControlButton != null){
if( ev.getRawX() > lastControlButton.getControlView().getX() + location[0]
&& ev.getRawX() < lastControlButton.getControlView().getX() + lastControlButton.getControlView().getWidth() + location[0]
&& ev.getRawY() > lastControlButton.getControlView().getY()
&& ev.getRawY() < lastControlButton.getControlView().getY() + lastControlButton.getControlView().getHeight()){
return true;
}
}
//Release last keys
if (lastControlButton != null) lastControlButton.sendKeyPresses(false);
mapTable.remove(v);
// Update the state of all swipeable buttons
for(ControlInterface button : getButtonChildren()){
if(!button.getProperties().isSwipeable) continue;
@@ -323,18 +338,16 @@ public class ControlLayout extends FrameLayout {
&& ev.getRawY() > button.getControlView().getY()
&& ev.getRawY() < button.getControlView().getY() + button.getControlView().getHeight()){
if(mapTable.get(button.getControlView()) == null){
//Press the new key
if(!button.equals(lastControlButton)){
button.sendKeyPresses(true);
mapTable.put(button.getControlView(), button);
}
}else{
if(mapTable.get(button.getControlView()) != null){
button.sendKeyPresses(false);
mapTable.remove(button.getControlView());
mapTable.put(v, button);
return true;
}
}
}
return true;
return false;
}
@Override