From 92e413fa06b8d0da1263c64f231933bbf27236b9 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 12 Nov 2016 06:57:05 -0800 Subject: [PATCH] make boardBegin() a no-op in C instead of a no-op in java, which takes more work to get to. --- xwords4/android/XWords4/jni/drawwrapper.c | 12 +++--------- .../src/org/eehouse/android/xw4/BoardCanvas.java | 5 ----- .../src/org/eehouse/android/xw4/jni/DrawCtx.java | 1 - 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/xwords4/android/XWords4/jni/drawwrapper.c b/xwords4/android/XWords4/jni/drawwrapper.c index 7e2f9bbd2..b26bfe9a8 100644 --- a/xwords4/android/XWords4/jni/drawwrapper.c +++ b/xwords4/android/XWords4/jni/drawwrapper.c @@ -353,17 +353,11 @@ static XP_Bool and_draw_beginDraw( DrawCtx* XP_UNUSED(dctx) ) {return XP_TRUE;} static void and_draw_endDraw( DrawCtx* XP_UNUSED(dctx) ) {} static XP_Bool -and_draw_boardBegin( DrawCtx* dctx, const XP_Rect* rect, - XP_U16 cellWidth, XP_U16 cellHeight, +and_draw_boardBegin( DrawCtx* XP_UNUSED(dctx), const XP_Rect* XP_UNUSED(rect), + XP_U16 XP_UNUSED(cellWidth), XP_U16 XP_UNUSED(cellHeight), DrawFocusState XP_UNUSED(dfs) ) { - DRAW_CBK_HEADER( "boardBegin", "(Landroid/graphics/Rect;II)Z" ); - - jobject jrect = makeJRect( draw, JCACHE_RECT0, rect ); - - jboolean result = (*env)->CallBooleanMethod( env, draw->jdraw, mid, - jrect, cellWidth, cellHeight ); - return result; + return XP_TRUE; } static XP_Bool diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java index 0f6445964..e0532883b 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java @@ -345,11 +345,6 @@ public class BoardCanvas extends Canvas implements DrawCtx { } } - public boolean boardBegin( Rect rect, int cellWidth, int cellHeight ) - { - return true; - } - public boolean drawCell( final Rect rect, String text, int tile, int value, int owner, int bonus, int hintAtts, final int flags ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/DrawCtx.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/DrawCtx.java index b1d65a74c..fbf7b1e14 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/DrawCtx.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/DrawCtx.java @@ -56,7 +56,6 @@ public interface DrawCtx { // Rect[] playerRects ); void drawTimer( Rect rect, int player, int secondsLeft ); - boolean boardBegin( Rect rect, int cellWidth, int cellHeight ); boolean drawCell( Rect rect, String text, int tile, int value, int owner, int bonus, int hintAtts, int flags );