Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-22 07:28:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

set a minimum width for rem tiles display based on screen width rather

Browse source 
than pixels
This commit is contained in:
Eric House 2013-11-09 07:15:28 -08:00
parent 3e6a7418b1
commit 26a464aae4
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,6 +61,7 @@ public class BoardCanvas extends Canvas implements DrawCtx {
private String m_remText; private String m_remText;
private int m_mediumFontHt; private int m_mediumFontHt;
private int m_defaultFontHt; private int m_defaultFontHt;
private int m_minRemWidth;
private Rect m_boundsScratch = new Rect(); private Rect m_boundsScratch = new Rect();
private Rect m_letterRect; private Rect m_letterRect;
private Rect m_valRect; private Rect m_valRect;
@ -119,7 +120,8 @@ public class BoardCanvas extends Canvas implements DrawCtx {
} }
private FontDims m_fontDims; private FontDims m_fontDims;
public BoardCanvas( Activity activity, Bitmap bitmap, JNIThread jniThread ) public BoardCanvas( Activity activity, Bitmap bitmap, JNIThread jniThread,
BoardDims dims )
{ {
super( bitmap ); super( bitmap );
m_activity = activity; m_activity = activity;
@ -131,6 +133,9 @@ public class BoardCanvas extends Canvas implements DrawCtx {
float scale = activity.getResources().getDisplayMetrics().density; float scale = activity.getResources().getDisplayMetrics().density;
m_defaultFontHt = (int)(MIN_FONT_DIPS * scale + 0.5f); m_defaultFontHt = (int)(MIN_FONT_DIPS * scale + 0.5f);
m_mediumFontHt = m_defaultFontHt * 3 / 2; m_mediumFontHt = m_defaultFontHt * 3 / 2;
if ( null != dims ) {
m_minRemWidth = dims.cellSize;
}
m_drawPaint = new Paint(); m_drawPaint = new Paint();
m_fillPaint = new Paint( Paint.ANTI_ALIAS_FLAG ); m_fillPaint = new Paint( Paint.ANTI_ALIAS_FLAG );
@ -192,8 +197,8 @@ public class BoardCanvas extends Canvas implements DrawCtx {
m_boundsScratch ); m_boundsScratch );
int minWidth = m_boundsScratch.width(); int minWidth = m_boundsScratch.width();
if ( minWidth < 20 ) { if ( minWidth < m_minRemWidth ) {
minWidth = 20; // it's a button; make it bigger minWidth = m_minRemWidth; // it's a button; make it bigger
} }
width[0] = minWidth; width[0] = minWidth;
height[0] = m_boundsScratch.height(); height[0] = m_boundsScratch.height();

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

@ -252,7 +252,7 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
if ( null == m_canvas ) { if ( null == m_canvas ) {
DbgUtils.logf( "layoutBoardOnce: allocating canvas for %d, %d", DbgUtils.logf( "layoutBoardOnce: allocating canvas for %d, %d",
bmWidth, bmHeight ); bmWidth, bmHeight );
m_canvas = new BoardCanvas( m_parent, s_bitmap, m_jniThread ); m_canvas = new BoardCanvas( m_parent, s_bitmap, m_jniThread, m_dims );
} }
m_jniThread.handle( JNIThread.JNICmd.CMD_SETDRAW, m_canvas ); m_jniThread.handle( JNIThread.JNICmd.CMD_SETDRAW, m_canvas );
m_jniThread.handle( JNIThread.JNICmd.CMD_DRAW ); m_jniThread.handle( JNIThread.JNICmd.CMD_DRAW );

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/ThumbCanvas.java
View file

@ -28,7 +28,7 @@ public class ThumbCanvas extends BoardCanvas {
public ThumbCanvas( Activity activity, Bitmap bitmap ) public ThumbCanvas( Activity activity, Bitmap bitmap )
{ {
super( activity, bitmap, null ); super( activity, bitmap, null, null );
DbgUtils.logf( "creating new ThumbCanvas" ); DbgUtils.logf( "creating new ThumbCanvas" );
} }