eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 3cca4a81e9 into 8a4ce6c658

This commit is contained in:
Alexander Batalov 2022-12-08 17:42:50 +02:00 committed by GitHub
parent 8a4ce6c658 3cca4a81e9
commit 1034cbd467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/android/app/src/main/java/org/libsdl/app/SDLActivity.java
View File

@ -2036,6 +2036,14 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
switch (event.getAction()) { switch (event.getAction()) {
case KeyEvent.ACTION_DOWN: case KeyEvent.ACTION_DOWN:
case KeyEvent.ACTION_UP: case KeyEvent.ACTION_UP:
if (keyCode == KeyEvent.KEYCODE_BACK) {
if (event.getAction() == KeyEvent.ACTION_DOWN) {
SDLActivity.onNativeMouse(MotionEvent.BUTTON_SECONDARY, MotionEvent.ACTION_DOWN, 0, 0, true);
} else if (event.getAction() == KeyEvent.ACTION_UP) {
SDLActivity.onNativeMouse(MotionEvent.BUTTON_SECONDARY, MotionEvent.ACTION_UP, 0, 0, true);
}
}
// mark the event as handled or it will be handled by system // mark the event as handled or it will be handled by system
// handling KEYCODE_BACK by system will call onBackPressed() // handling KEYCODE_BACK by system will call onBackPressed()
return true; return true;

1
src/win32.cc
View File

@ -53,6 +53,7 @@ int main(int argc, char* argv[])
#endif #endif
#if __ANDROID__ #if __ANDROID__
SDL_SetHint(SDL_HINT_ANDROID_TRAP_BACK_BUTTON, "1");
SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0"); SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0");
SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0"); SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
chdir(SDL_AndroidGetExternalStoragePath()); chdir(SDL_AndroidGetExternalStoragePath());