Skip to content

Commit 7347961

Browse files
committed
Android: trigger keyboard events of Android game keys with or without an active joystick. Fixes liballeg#1479
1 parent 0be7a02 commit 7347961

File tree

1 file changed

+9
-13
lines changed
  • android/gradle_project/allegro/src/main/java/org/liballeg/android

1 file changed

+9
-13
lines changed

android/gradle_project/allegro/src/main/java/org/liballeg/android/KeyListener.java

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,21 +139,17 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
139139
if (index >= 0) {
140140
code = getCode(keyCode, event, index);
141141
}
142-
if (code == -1) {
143-
return onKeyboardKey(v, keyCode, event);
144-
}
145-
else if (code == -2) {
146-
return true;
147-
}
148-
if (event.getAction() == KeyEvent.ACTION_DOWN) {
149-
if (event.getRepeatCount() == 0) {
150-
nativeOnJoystickButton(index, code, true);
142+
if (code >= 0) {
143+
if (event.getAction() == KeyEvent.ACTION_DOWN) {
144+
if (event.getRepeatCount() == 0) {
145+
nativeOnJoystickButton(index, code, true);
146+
}
147+
}
148+
else {
149+
nativeOnJoystickButton(index, code, false);
151150
}
152151
}
153-
else {
154-
nativeOnJoystickButton(index, code, false);
155-
}
156-
return true;
152+
return onKeyboardKey(v, keyCode, event);
157153
}
158154

159155
private void volumeChange(int inc)

0 commit comments

Comments
 (0)