Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix problems detecting orientation change: instead of passing a

Browse source 
message, have draw check if dimensions are same as when did layout and
redo them if they're changed.  Works because the OS wants us to redraw
as soon as orientation changes.  But this makes it easier to hit a
synchronization problem: if re-layout happens mid-draw then canvas or
other draw-related objects may be null.  Need to get rid of the jni
thread OR synchronization drawing and layout.
This commit is contained in:
eehouse 2010-02-15 02:48:27 +00:00
parent 996351cc9c
commit 84fa9bce88
2 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -317,15 +317,6 @@ public class BoardActivity extends Activity implements UtilCtxt {
return handled;
}
// gets called for orientation changes only if
// android:configChanges="orientation" set in AndroidManifest.xml
public void onConfigurationChanged( Configuration newConfig )
{
Utils.logf( "BoardActivity::onConfigurationChanged called" );
m_view.changeLayout();
super.onConfigurationChanged( newConfig );
}
//////////////////////////////////////////
// XW_UtilCtxt interface implementation //
//////////////////////////////////////////

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

@ -24,7 +24,8 @@ public class BoardView extends View implements DrawCtx,
private Paint m_tileStrokePaint;
private int m_jniGamePtr;
private CurGameInfo m_gi;
private boolean m_boardSet = false;
private int m_layoutWidth = 0;
private int m_layoutHeight = 0;
private Canvas m_canvas;
private Bitmap m_bitmap;
private int m_trayOwner;
@ -140,14 +141,18 @@ public class BoardView extends View implements DrawCtx,
private boolean layoutBoardOnce()
{
if ( !m_boardSet && null != m_gi ) {
m_boardSet = true;
int width = getWidth();
int height = getHeight();
boolean layoutDone = width == m_layoutWidth && height == m_layoutHeight;
if ( layoutDone ) {
// nothing to do
} else if ( null == m_gi ) {
// nothing to do either
} else {
m_layoutWidth = width;
m_layoutHeight = height;
m_cellDims = m_trayDims = null; // force recalc of font
// For now we're assuming vertical orientation. Fix way
// later.
int width = getWidth();
int height = getHeight();
int nCells = m_gi.boardSize;
int cellSize = width / nCells;
m_left = (width % nCells) / 2;
@ -169,7 +174,6 @@ public class BoardView extends View implements DrawCtx,
} else {
//
nToScroll = nCells - ((height - (cellSize*3)) / cellSize);
Utils.logf( "nToScroll: " + nToScroll );
trayHt = height - (cellSize * (1 + (nCells-nToScroll)));
m_top = 0;
}
@ -184,13 +188,9 @@ public class BoardView extends View implements DrawCtx,
m_jniThread.handle( JNIThread.JNICmd.CMD_LAYOUT, getWidth(),
getHeight(), m_gi.boardSize );
m_jniThread.handle( JNIThread.JNICmd.CMD_DRAW );
layoutDone = true;
}
return m_boardSet;
}
public void changeLayout()
{
m_boardSet = false;
return layoutDone;
}
public void startHandling( JNIThread thread, int gamePtr, CurGameInfo gi )
@ -380,7 +380,7 @@ public class BoardView extends View implements DrawCtx,
public void objFinished( /*BoardObjectType*/int typ, Rect rect, int dfs )
{
if ( DrawCtx.OBJ_SCORE == typ ) {
m_canvas.restore();
m_canvas.restoreToCount(1); // in case new canvas...
}
}
@ -430,7 +430,7 @@ public class BoardView extends View implements DrawCtx,
m_canvas.drawRect( rect, m_tileStrokePaint ); // frame
}
}
m_canvas.restore();
m_canvas.restoreToCount(1); // in case new canvas....
} // drawTileImpl
private void drawCentered( String text, Rect rect )