GRIN/android-activity
1
0
Fork 0
mirror of https://github.com/rust-mobile/android-activity.git synced 2026-07-11 00:58:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

GameActivity PATCH: compilation fixes

Browse Source 
Fixes some compilation bugs in the upstream AGDK glue code:
https://issuetracker.google.com/issues/229997306
This commit is contained in:
Robert Bragg
2022-05-08 22:25:03 +01:00
parent e27b6b5a44
commit 9267b60938
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-activity/csrc/game-activity/GameActivity.cpp
+5 -5
View File
@@ -1080,7 +1080,7 @@ extern "C" void GameActivityKeyEvent_fromJava(JNIEnv *env, jobject keyEvent,
static bool onTouchEvent_native(JNIEnv *env, jobject javaGameActivity,
jlong handle, jobject motionEvent) {
if (handle == 0) return;
if (handle == 0) return false;
NativeCode *code = (NativeCode *)handle;
if (code->callbacks.onTouchEvent == nullptr) return false;
@@ -1091,7 +1091,7 @@ static bool onTouchEvent_native(JNIEnv *env, jobject javaGameActivity,
static bool onKeyUp_native(JNIEnv *env, jobject javaGameActivity, jlong handle,
jobject keyEvent) {
if (handle == 0) return;
if (handle == 0) return false;
NativeCode *code = (NativeCode *)handle;
if (code->callbacks.onKeyUp == nullptr) return false;
@@ -1102,9 +1102,9 @@ static bool onKeyUp_native(JNIEnv *env, jobject javaGameActivity, jlong handle,
static bool onKeyDown_native(JNIEnv *env, jobject javaGameActivity,
jlong handle, jobject keyEvent) {
if (handle == 0) return;
if (handle == 0) return false;
NativeCode *code = (NativeCode *)handle;
if (code->callbacks.onKeyDown == nullptr) return;
if (code->callbacks.onKeyDown == nullptr) return false;
static GameActivityKeyEvent c_event;
GameActivityKeyEvent_fromJava(env, keyEvent, &c_event);
@@ -1223,7 +1223,7 @@ static const char *const kWindowInsetsCompatTypePathName =
#define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \
var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \
LOG_FATAL_IF(!var, "Unable to find field %s" fieldName);
LOG_FATAL_IF(!var, "Unable to find field %s", fieldName);
static int jniRegisterNativeMethods(JNIEnv *env, const char *className,
const JNINativeMethod *methods,
game-activity/csrc/game-text-input/gametextinput.cpp
-2
View File
@@ -210,8 +210,6 @@ GameTextInput::GameTextInput(JNIEnv *env, uint32_t max_string_size)
env_->GetFieldID(stateJavaClass_, "composingRegionStart", "I");
stateClassInfo_.composingRegionEnd =
env_->GetFieldID(stateJavaClass_, "composingRegionEnd", "I");
return s_gameTextInput.get();
}
GameTextInput::~GameTextInput() {