From f311a54ffb3e06d31bd32806f43fdeaaff6dada0 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 10 Jan 2021 12:42:10 +0100 Subject: [PATCH] app/internal/window: [android] remove redundant context argument Signed-off-by: Elias Naur --- app/internal/window/GioView.java | 6 +++--- app/internal/window/os_android.go | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/internal/window/GioView.java b/app/internal/window/GioView.java index 9182fffe..46153226 100644 --- a/app/internal/window/GioView.java +++ b/app/internal/window/GioView.java @@ -124,12 +124,12 @@ public final class GioView extends SurfaceView implements Choreographer.FrameCal return true; } - private void setCursor(Context ctx, int id) { + private void setCursor(int id) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { return; } - PointerIcon pointerIcon = PointerIcon.getSystemIcon(ctx, id); - GioView.this.setPointerIcon(pointerIcon); + PointerIcon pointerIcon = PointerIcon.getSystemIcon(getContext(), id); + setPointerIcon(pointerIcon); } private void dispatchMotionEvent(MotionEvent event) { diff --git a/app/internal/window/os_android.go b/app/internal/window/os_android.go index eea49cf3..a81f9fb4 100644 --- a/app/internal/window/os_android.go +++ b/app/internal/window/os_android.go @@ -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.hideTextInput = getMethodID(env, class, "hideTextInput", "()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) w := &window{ @@ -679,8 +679,7 @@ func (w *window) SetCursor(name pointer.CursorName) { curID = 0 // TYPE_NULL } runOnMain(func(env *C.JNIEnv) { - callVoidMethod(env, w.view, gioView.setCursor, - jvalue(android.appCtx), jvalue(curID)) + callVoidMethod(env, w.view, gioView.setCursor, jvalue(curID)) }) }