joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 01:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

app/internal/window: [android] remove redundant context argument

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-01-10 12:42:10 +01:00
parent 5155893781
commit f311a54ffb
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/window/GioView.java
+3 -3
View File
@@ -124,12 +124,12 @@ public final class GioView extends SurfaceView implements Choreographer.FrameCal
return true; return true;
} }
private void setCursor(Context ctx, int id) { private void setCursor(int id) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
return; return;
} }
PointerIcon pointerIcon = PointerIcon.getSystemIcon(ctx, id); PointerIcon pointerIcon = PointerIcon.getSystemIcon(getContext(), id);
GioView.this.setPointerIcon(pointerIcon); setPointerIcon(pointerIcon);
} }
private void dispatchMotionEvent(MotionEvent event) { private void dispatchMotionEvent(MotionEvent event) {
app/internal/window/os_android.go
+2 -3
View File
@@ -206,7 +206,7 @@ func Java_org_gioui_GioView_onCreateView(env *C.JNIEnv, class C.jclass, view C.j
m.showTextInput = getMethodID(env, class, "showTextInput", "()V") m.showTextInput = getMethodID(env, class, "showTextInput", "()V")
m.hideTextInput = getMethodID(env, class, "hideTextInput", "()V") m.hideTextInput = getMethodID(env, class, "hideTextInput", "()V")
m.postFrameCallback = getMethodID(env, class, "postFrameCallback", "()V") m.postFrameCallback = getMethodID(env, class, "postFrameCallback", "()V")
m.setCursor = getMethodID(env, class, "setCursor", "(Landroid/content/Context;I)V") m.setCursor = getMethodID(env, class, "setCursor", "(I)V")
}) })
view = C.gio_jni_NewGlobalRef(env, view) view = C.gio_jni_NewGlobalRef(env, view)
w := &window{ w := &window{
@@ -679,8 +679,7 @@ func (w *window) SetCursor(name pointer.CursorName) {
curID = 0 // TYPE_NULL curID = 0 // TYPE_NULL
} }
runOnMain(func(env *C.JNIEnv) { runOnMain(func(env *C.JNIEnv) {
callVoidMethod(env, w.view, gioView.setCursor, callVoidMethod(env, w.view, gioView.setCursor, jvalue(curID))
jvalue(android.appCtx), jvalue(curID))
}) })
} }