Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-31 19:57:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

call through to canvas for current score to correctly update menu

Browse source
This commit is contained in:
Eric House 2013-11-12 06:40:40 -08:00
parent f14be36bbc
commit e2aea4a39e
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java
View file

@ -176,6 +176,11 @@ public class BoardCanvas extends Canvas implements DrawCtx {
return m_trayOwner; return m_trayOwner;
} }
public int curPending()
{
return m_pendingScore;
}
public void setInTrade( boolean inTrade ) public void setInTrade( boolean inTrade )
{ {
if ( m_inTrade != inTrade ) { if ( m_inTrade != inTrade ) {

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
View file

@ -60,7 +60,6 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
private JNIThread m_jniThread; private JNIThread m_jniThread;
private XWActivity m_parent; private XWActivity m_parent;
private Rect m_boundsScratch; private Rect m_boundsScratch;
private int m_pendingScore;
private boolean m_measuredFromDims = false; private boolean m_measuredFromDims = false;
private BoardDims m_dims; private BoardDims m_dims;
private CommsAddrRec.CommsConnType m_connType = private CommsAddrRec.CommsConnType m_connType =
@ -337,7 +336,7 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
public int curPending() public int curPending()
{ {
return m_pendingScore; return null == m_canvas? 0 : m_canvas.curPending();
} }
private int getSpacing( MotionEvent event ) private int getSpacing( MotionEvent event )