Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use fillRect instead of two lines

Browse source
This commit is contained in:
eehouse 2010-02-28 16:53:48 +00:00
parent b4f40627ae
commit 36fd71bde8
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -275,8 +275,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
{
int indx = focussed ? CommonPrefs.COLOR_FOCUS
: CommonPrefs.COLOR_TILE_BACK;
m_fillPaint.setColor( m_otherColors[indx] );
m_canvas.drawRect( rOuter, m_fillPaint );
fillRect( rOuter, m_otherColors[indx] );
m_fillPaint.setColor( BLACK );
drawCentered( m_remText, rOuter, null );
@ -308,8 +307,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
public void score_drawPlayer( Rect rInner, Rect rOuter, DrawScoreInfo dsi )
{
if ( 0 != (dsi.flags & CELL_ISCURSOR) ) {
m_fillPaint.setColor( m_otherColors[CommonPrefs.COLOR_FOCUS] );
m_canvas.drawRect( rOuter, m_fillPaint );
fillRect( rOuter, m_otherColors[CommonPrefs.COLOR_FOCUS] );
}
String text = m_scores[dsi.playerNum];
m_fillPaint.setColor( m_playerColors[dsi.playerNum] );
@ -362,8 +360,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
foreColor = m_playerColors[owner];
}
m_fillPaint.setColor( backColor );
m_canvas.drawRect( rect, m_fillPaint );
fillRect( rect, backColor );
if ( empty ) {
if ( (CELL_ISSTAR & flags) != 0 ) {
@ -541,8 +538,8 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
}
private void drawTileImpl( Rect rect, String text,
BitmapDrawable[] bitmaps, int val,
int flags, boolean clearBack )
BitmapDrawable[] bitmaps, int val,
int flags, boolean clearBack )
{
// boolean valHidden = (flags & CELL_VALHIDDEN) != 0;
boolean notEmpty = (flags & CELL_ISEMPTY) == 0;
@ -561,8 +558,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
if ( clearBack ) {
int indx = isCursor? CommonPrefs.COLOR_FOCUS
: CommonPrefs.COLOR_TILE_BACK;
m_fillPaint.setColor( m_otherColors[indx] );
m_canvas.drawRect( rect, m_fillPaint );
fillRect( rect, m_otherColors[indx] );
}
m_fillPaint.setColor( m_playerColors[m_trayOwner] );