Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-13 08:01:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

draw pending score smaller when has more digits; move rem up one pixel same as score.

Browse source
This commit is contained in:
ehouse 2009-11-19 02:29:39 +00:00
parent b8e7cd411f
commit 98ad2c3147
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
xwords4/wince/cedraw.c
View file

@ -1548,11 +1548,10 @@ DRAW_FUNC_NAME(drawRemText)( DrawCtx* p_dctx, const XP_Rect* rInner,
FillRect( hdc, &rt, dctx->brushes[bkColor] );
XPRtoRECT( &rt, rInner );
InsetRect( &rt, 1, 1 );
fce = ceGetSizedFont( dctx, RFONTS_SCORE, 0, 0, 0 );
oldFont = SelectObject( hdc, fce->setFont );
ceDrawLinesClipped( hdc, fce, buf, CP_ACP, XP_TRUE, &rt );
ceDrawLinesClipped( hdc, fce, buf, CP_UTF8, XP_TRUE, &rt );
(void)SelectObject( hdc, oldFont );
} /* ce_draw_drawRemText */
@ -1710,7 +1709,16 @@ DRAW_FUNC_NAME(score_pendingScore)( DrawCtx* p_dctx, const XP_Rect* xprect,
HFONT oldFont;
XP_U16 spareHt;
fce = ceGetSizedFont( dctx, RFONTS_PTS, xprect->height, xprect->width, 3 );
if ( score < 0 ) {
widebuf[0] = '?';
widebuf[1] = '?';
widebuf[2] = '\0';
} else {
swprintf( widebuf, L"%dp", score );
}
fce = ceGetSizedFont( dctx, RFONTS_PTS, xprect->height, xprect->width,
wcslen(widebuf) );
spareHt = xprect->height - fce->glyphHt;
oldFont = SelectObject( hdc, fce->setFont );
@ -1722,14 +1730,6 @@ DRAW_FUNC_NAME(score_pendingScore)( DrawCtx* p_dctx, const XP_Rect* xprect,
ceClipToRect( hdc, &rt );
FillRect( hdc, &rt, dctx->brushes[bkIndex] );
if ( score < 0 ) {
widebuf[0] = '?';
widebuf[1] = '?';
widebuf[2] = '\0';
} else {
swprintf( widebuf, L"%dp", score );
}
ceDrawTextClipped( hdc, widebuf, -1, XP_FALSE, fce,
xprect->left, xprect->top + (spareHt/2),
xprect->width, DT_CENTER );