From e2aea4a39eae44405c52269ef1f523332a16c2a8 Mon Sep 17 00:00:00 2001 From: Eric House Date: Tue, 12 Nov 2013 06:40:40 -0800 Subject: [PATCH] call through to canvas for current score to correctly update menu --- .../XWords4/src/org/eehouse/android/xw4/BoardCanvas.java | 5 +++++ .../XWords4/src/org/eehouse/android/xw4/BoardView.java | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 bc38efcea..faf80aee5 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java @@ -176,6 +176,11 @@ public class BoardCanvas extends Canvas implements DrawCtx { return m_trayOwner; } + public int curPending() + { + return m_pendingScore; + } + public void setInTrade( boolean inTrade ) { if ( m_inTrade != inTrade ) { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java index 6c570e67f..c060b46c5 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java @@ -60,7 +60,6 @@ public class BoardView extends View implements BoardHandler, SyncedDraw { private JNIThread m_jniThread; private XWActivity m_parent; private Rect m_boundsScratch; - private int m_pendingScore; private boolean m_measuredFromDims = false; private BoardDims m_dims; private CommsAddrRec.CommsConnType m_connType = @@ -337,7 +336,7 @@ public class BoardView extends View implements BoardHandler, SyncedDraw { public int curPending() { - return m_pendingScore; + return null == m_canvas? 0 : m_canvas.curPending(); } private int getSpacing( MotionEvent event )