mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-29 08:34:37 +01:00
minor bugs with tray focus: player color not used for pending score;
pending score doesn't show focus; focussed empty tile slots drawn with bogus value.
This commit is contained in:
parent
0a34c2512c
commit
6bb1170ca8
1 changed files with 11 additions and 7 deletions
|
@ -457,8 +457,9 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
|
|||
{
|
||||
String text = score >= 0? String.format( "%d", score ) : "??";
|
||||
++rect.top;
|
||||
clearToBack( rect );
|
||||
m_fillPaint.setColor( BLACK );
|
||||
fillRect( rect, (0 == (flags & CELL_ISCURSOR))
|
||||
? WHITE : m_otherColors[CommonPrefs.COLOR_FOCUS] );
|
||||
m_fillPaint.setColor( m_playerColors[playerNum] );
|
||||
rect.inset( 0, rect.height() / 4 );
|
||||
drawCentered( text, rect, null );
|
||||
}
|
||||
|
@ -576,12 +577,15 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
|
|||
}
|
||||
|
||||
m_fillPaint.setColor( m_playerColors[m_trayOwner] );
|
||||
positionDrawTile( rect, text, bitmaps, val );
|
||||
|
||||
m_canvas.drawRect( rect, m_tileStrokePaint); // frame
|
||||
if ( 0 != (flags & CELL_HIGHLIGHT) ) {
|
||||
rect.inset( 2, 2 );
|
||||
m_canvas.drawRect( rect, m_tileStrokePaint ); // frame
|
||||
if ( notEmpty ) {
|
||||
positionDrawTile( rect, text, bitmaps, val );
|
||||
|
||||
m_canvas.drawRect( rect, m_tileStrokePaint); // frame
|
||||
if ( 0 != (flags & CELL_HIGHLIGHT) ) {
|
||||
rect.inset( 2, 2 );
|
||||
m_canvas.drawRect( rect, m_tileStrokePaint ); // frame
|
||||
}
|
||||
}
|
||||
}
|
||||
m_canvas.restoreToCount(1); // in case new canvas....
|
||||
|
|
Loading…
Add table
Reference in a new issue