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

Allow no space for REM text when no tiles left to allow more room for scores.

Browse source
This commit is contained in:
ehouse 2006-06-16 01:15:44 +00:00
parent cc4ebf2ad2
commit 4561d86601
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
wince/cedraw.c
View file

@ -579,17 +579,15 @@ DRAW_FUNC_NAME(scoreBegin)( DrawCtx* p_dctx, const XP_Rect* rect,
static void
formatRemText( HDC hdc, XP_S16 nTilesLeft, XP_Bool isVertical, XP_UCHAR* buf )
{
if ( nTilesLeft <= 0 ) {
buf[0] = 0;
} else {
char* fmt;
if ( isVertical ) {
fmt = "Rem" XP_CR "%d";
} else {
fmt = "Rem:%d";
}
sprintf( buf, fmt, nTilesLeft );
char* fmt;
XP_ASSERT( nTilesLeft > 0 );
if ( isVertical ) {
fmt = "Rem" XP_CR "%d";
} else {
fmt = "Rem:%d";
}
sprintf( buf, fmt, nTilesLeft );
} /* formatRemText */
DLSTATIC void
@ -602,8 +600,12 @@ DRAW_FUNC_NAME(measureRemText)( DrawCtx* p_dctx, const XP_Rect* r,
HDC hdc = globals->hdc;
XP_UCHAR buf[16];
formatRemText( hdc, nTilesLeft, dctx->scoreIsVertical, buf );
measureText( dctx, buf, CE_REM_PADDING, width, height );
if ( nTilesLeft > 0 ) {
formatRemText( hdc, nTilesLeft, dctx->scoreIsVertical, buf );
measureText( dctx, buf, CE_REM_PADDING, width, height );
} else {
*width = *height = 0;
}
} /* ce_draw_measureRemText */
DLSTATIC void