Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix so board draws correctly when loaded in trade mode

Browse source
This commit is contained in:
Eric House 2013-11-10 06:55:01 -08:00
parent 82a82b5ae1
commit 7457ce9b80
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -767,7 +767,7 @@ public class BoardActivity extends XWActivity
item.setTitle( R.string.board_menu_game_final );
}
if ( DeviceRole.SERVER_STANDALONE == m_gi.serverRole ) {
if ( null != m_gi && DeviceRole.SERVER_STANDALONE == m_gi.serverRole ) {
Utils.setItemVisible( menu, R.id.board_menu_game_resend, false );
Utils.setItemVisible( menu, R.id.gamel_menu_checkmoves, false );
}
@ -1803,8 +1803,8 @@ public class BoardActivity extends XWActivity
updateToolbar();
if ( m_inTrade != m_gsi.inTrade ) {
m_inTrade = m_gsi.inTrade;
m_view.setInTrade( m_inTrade );
}
m_view.setInTrade( m_inTrade );
adjustTradeVisibility();
Activity self = BoardActivity.this;
Utils.invalidateOptionsMenuIf( self );

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

@ -178,7 +178,10 @@ public class BoardCanvas extends Canvas implements DrawCtx {
public void setInTrade( boolean inTrade )
{
m_inTrade = inTrade;
if ( m_inTrade != inTrade ) {
m_inTrade = inTrade;
m_jniThread.handle( JNIThread.JNICmd.CMD_INVALALL );
}
}
// DrawCtxt interface implementation

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

@ -321,7 +321,6 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
if ( null != m_canvas ) {
m_canvas.setInTrade( inTrade );
}
m_jniThread.handle( JNIThread.JNICmd.CMD_INVALALL );
}
public int getCurPlayer()