Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

name change only

Browse source
This commit is contained in:
ehouse 2008-03-30 23:58:04 +00:00
parent f1c8dd6190
commit e572034ac5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wince/cedraw.c
View file

@ -173,7 +173,7 @@ ceGetSizedFont( CEDrawCtx* dctx, XP_U16 height, RFIndex index )
} }
static void static void
measureText( CEDrawCtx* dctx, const XP_UCHAR* str, XP_S16 padding, ceMeasureText( CEDrawCtx* dctx, const XP_UCHAR* str, XP_S16 padding,
XP_U16* widthP, XP_U16* heightP ) XP_U16* widthP, XP_U16* heightP )
{ {
HDC hdc = GetDC(dctx->mainWin);//globals->hdc; HDC hdc = GetDC(dctx->mainWin);//globals->hdc;
@ -205,7 +205,7 @@ measureText( CEDrawCtx* dctx, const XP_UCHAR* str, XP_S16 padding,
*widthP = maxWidth + 8; *widthP = maxWidth + 8;
*heightP = height; *heightP = height;
} /* measureText */ } /* ceMeasureText */
static void static void
drawLines( CEDrawCtx* dctx, HDC hdc, const XP_UCHAR* text, XP_S16 padding, drawLines( CEDrawCtx* dctx, HDC hdc, const XP_UCHAR* text, XP_S16 padding,
@ -701,11 +701,11 @@ DRAW_FUNC_NAME(measureRemText)( DrawCtx* p_dctx, const XP_Rect* XP_UNUSED(r),
XP_U16* width, XP_U16* height ) XP_U16* width, XP_U16* height )
{ {
CEDrawCtx* dctx = (CEDrawCtx*)p_dctx; CEDrawCtx* dctx = (CEDrawCtx*)p_dctx;
XP_UCHAR buf[16];
if ( nTilesLeft > 0 ) { if ( nTilesLeft > 0 ) {
XP_UCHAR buf[16];
formatRemText( nTilesLeft, dctx->scoreIsVertical, buf ); formatRemText( nTilesLeft, dctx->scoreIsVertical, buf );
measureText( dctx, buf, CE_REM_PADDING, width, height ); ceMeasureText( dctx, buf, CE_REM_PADDING, width, height );
} else { } else {
*width = *height = 0; *width = *height = 0;
} }
@ -765,7 +765,7 @@ ceWidthAndText( CEDrawCtx* dctx, const DrawScoreInfo* dsi,
strcat( buf, bullet ); strcat( buf, bullet );
measureText( dctx, buf, CE_SCORE_PADDING, widthP, heightP ); ceMeasureText( dctx, buf, CE_SCORE_PADDING, widthP, heightP );
if ( dsi->isTurn && dctx->scoreIsVertical ) { if ( dsi->isTurn && dctx->scoreIsVertical ) {
*heightP += IS_TURN_VPAD * 2; *heightP += IS_TURN_VPAD * 2;
} }
@ -969,7 +969,7 @@ DRAW_FUNC_NAME(measureMiniWText)( DrawCtx* p_dctx, const XP_UCHAR* str,
XP_U16* widthP, XP_U16* heightP ) XP_U16* widthP, XP_U16* heightP )
{ {
CEDrawCtx* dctx = (CEDrawCtx*)p_dctx; CEDrawCtx* dctx = (CEDrawCtx*)p_dctx;
measureText( dctx, str, CE_MINIW_PADDING, widthP, heightP ); ceMeasureText( dctx, str, CE_MINIW_PADDING, widthP, heightP );
*heightP += CE_MINI_V_PADDING; *heightP += CE_MINI_V_PADDING;
} /* ce_draw_measureMiniWText */ } /* ce_draw_measureMiniWText */
@ -993,7 +993,7 @@ DRAW_FUNC_NAME(drawMiniWindow)( DrawCtx* p_dctx, const XP_UCHAR* text,
hdc = BeginPaint( dctx->mainWin, &ps ); hdc = BeginPaint( dctx->mainWin, &ps );
} }
ceClearToBkground( (CEDrawCtx*)p_dctx, rect ); ceClearToBkground( dctx, rect );
SetBkColor( hdc, dctx->globals->appPrefs.colors[CE_BKG_COLOR] ); SetBkColor( hdc, dctx->globals->appPrefs.colors[CE_BKG_COLOR] );
SetTextColor( hdc, dctx->globals->appPrefs.colors[CE_BLACK_COLOR] ); SetTextColor( hdc, dctx->globals->appPrefs.colors[CE_BLACK_COLOR] );