godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

[3.2] Android: Keyboard modifier and arrow key support

Browse Source
This commit is contained in:
thebestnom
2020-11-01 01:09:09 +02:00
parent adf2dabbde
commit 8405f1225e
5 changed files with 94 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/java/lib/src/org/godotengine/godot/GodotView.java
View File

@@ -179,6 +179,10 @@ public class GodotView extends GLSurfaceView {
godot.onBackPressed();
}
public GodotInputHandler getInputHandler() {
return inputHandler;
}
@Override
public void onResume() {
super.onResume();

29
platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java
View File

@@ -167,14 +167,31 @@ public class GodotEditText extends EditText {
// ===========================================================
@Override
public boolean onKeyDown(final int keyCode, final KeyEvent keyEvent) {
super.onKeyDown(keyCode, keyEvent);
/* Let GlSurfaceView get focus if back key is input. */
if (keyCode == KeyEvent.KEYCODE_BACK) {
this.mView.requestFocus();
/* Let SurfaceView get focus if back key is input. */
// pass event to godot in special cases
if (needHandlingInGodot(keyCode, keyEvent) && mView.getInputHandler().onKeyDown(keyCode, keyEvent)) {
return true;
} else {
return super.onKeyDown(keyCode, keyEvent);
}
}
return true;
@Override
public boolean onKeyUp(int keyCode, KeyEvent keyEvent) {
if (needHandlingInGodot(keyCode, keyEvent) && mView.getInputHandler().onKeyUp(keyCode, keyEvent)) {
return true;
} else {
return super.onKeyUp(keyCode, keyEvent);
}
}
private boolean needHandlingInGodot(int keyCode, KeyEvent keyEvent) {
boolean isArrowKey = keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode == KeyEvent.KEYCODE_DPAD_DOWN ||
keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT;
boolean isModifiedKey = keyEvent.isAltPressed() || keyEvent.isCtrlPressed() || keyEvent.isSymPressed() ||
keyEvent.isFunctionPressed() || keyEvent.isMetaPressed();
return isArrowKey || keyCode == KeyEvent.KEYCODE_TAB || KeyEvent.isModifierKey(keyCode) ||
isModifiedKey;
}
// ===========================================================