moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pandroid: allow to bind volume keys (#814)

Browse Source 
* allow to bind volume keys

* fix mapping

* pass false instead of null
This commit is contained in:
Ishan09811
2025-11-01 16:15:59 +05:30
committed by GitHub
parent efdff98c05
commit 19f5e874c6
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java
View File

@@ -152,11 +152,7 @@ public class GameActivity extends BaseActivity implements EmulatorCallback, Sens
@Override @Override
public boolean dispatchKeyEvent(KeyEvent event) { public boolean dispatchKeyEvent(KeyEvent event) {
if (event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_UP || event.getKeyCode() == KeyEvent.KEYCODE_VOLUME_DOWN) { if ((!drawerFragment.isOpened()) && InputHandler.processKeyEvent(event, true)) {
return super.dispatchKeyEvent(event);
}
if ((!drawerFragment.isOpened()) && InputHandler.processKeyEvent(event)) {
return true; return true;
} }

2
src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapActivity.java
View File

@@ -47,7 +47,7 @@ public class InputMapActivity extends BaseActivity {
@Override @Override
public boolean dispatchKeyEvent(KeyEvent event) { public boolean dispatchKeyEvent(KeyEvent event) {
return InputHandler.processKeyEvent(event); return InputHandler.processKeyEvent(event, false);
} }
private void onInputEvent(InputEvent event) { private void onInputEvent(InputEvent event) {

9
src/pandroid/app/src/main/java/com/panda3ds/pandroid/input/InputHandler.java
View File

@@ -90,7 +90,7 @@ public class InputHandler {
return true; return true;
} }
public static boolean processKeyEvent(KeyEvent event) { public static boolean processKeyEvent(KeyEvent event, Boolean playing) {
if (!isSourceValid(event.getSource())) { if (!isSourceValid(event.getSource())) {
return false; return false;
} }
@@ -110,6 +110,13 @@ public class InputHandler {
} }
} }
String code = KeyEvent.keyCodeToString(event.getKeyCode()); String code = KeyEvent.keyCodeToString(event.getKeyCode());
if (playing == true) {
if (InputMap.relative(code) == KeyName.NULL) {
return false;
}
}
if (event.getAction() == KeyEvent.ACTION_UP) { if (event.getAction() == KeyEvent.ACTION_UP) {
keyDownEvents.remove(code); keyDownEvents.remove(code);
handleEvent(new InputEvent(code, 0.0f)); handleEvent(new InputEvent(code, 0.0f));