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

Print remaining tiles in scoreboard smaller and using tile background

Browse source 
color in attempt to make it clearer what the number means.  The goal
is to remove clutter and make more room for player name.
This commit is contained in:
ehouse 2009-10-24 14:53:17 +00:00
parent 85da3d2082
commit 5602827ebf
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
xwords4/wince/cedraw.c
View file

@ -1398,14 +1398,10 @@ DRAW_FUNC_NAME(scoreBegin)( DrawCtx* p_dctx, const XP_Rect* xprect,
} /* ce_draw_scoreBegin */
static void
formatRemText( const CEDrawCtx* dctx, XP_S16 nTilesLeft, XP_Bool isVertical,
XP_UCHAR* buf )
formatRemText( XP_S16 nTilesLeft, XP_UCHAR* buf, XP_U16 bufLen )
{
const char* rem = ceGetResString( dctx->globals, IDS_REM );
const char* sep = isVertical? XP_CR : ":";
XP_ASSERT( nTilesLeft > 0 );
sprintf( buf, "%s%s%d", rem, sep, nTilesLeft );
XP_SNPRINTF( buf, bufLen, "%d", nTilesLeft );
} /* formatRemText */
DLSTATIC void
@ -1424,7 +1420,7 @@ DRAW_FUNC_NAME(measureRemText)( DrawCtx* p_dctx, const XP_Rect* xprect,
XP_ASSERT( !!hdc );
formatRemText( dctx, nTilesLeft, dctx->scoreIsVertical, buf );
formatRemText( nTilesLeft, buf, VSIZE(buf) );
height = xprect->height - 2; /* space for border */
if ( height > globals->cellHt - CELL_BORDER ) {
@ -1453,18 +1449,19 @@ DRAW_FUNC_NAME(drawRemText)( DrawCtx* p_dctx, const XP_Rect* rInner,
CEDrawCtx* dctx = (CEDrawCtx*)p_dctx;
CEAppGlobals* globals = dctx->globals;
HDC hdc = globals->hdc;
XP_UCHAR buf[16];
XP_UCHAR buf[4];
HFONT oldFont;
const FontCacheEntry* fce;
RECT rt;
XP_U16 bkColor;
formatRemText( dctx, nTilesLeft, dctx->scoreIsVertical, buf );
formatRemText( nTilesLeft, buf, VSIZE(buf) );
XPRtoRECT( &rt, rInner );
if ( focussed ) {
ceSetBkColor( hdc, dctx, CE_FOCUS_COLOR );
FillRect( hdc, &rt, dctx->brushes[CE_FOCUS_COLOR] );
}
bkColor = focussed ? CE_FOCUS_COLOR : CE_TILEBACK_COLOR;
ceSetBkColor( hdc, dctx, bkColor );
FillRect( hdc, &rt, dctx->brushes[bkColor] );
InsetRect( &rt, 1, 1 );
fce = ceGetSizedFont( dctx, 0, 0, RFONTS_REM );