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

fix tile drawing; move rem string

Browse source
This commit is contained in:
ehouse 2004-01-10 18:02:10 +00:00
parent ffc4adc812
commit 1d96f29216
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
wince/cedraw.c
View file

@ -248,20 +248,26 @@ drawDrawTileGuts( DrawCtx* p_dctx, XP_Rect* xprect, XP_UCHAR* letters,
ceClearToBkground( dctx, xprect ); ceClearToBkground( dctx, xprect );
SetBkColor( hdc, dctx->colors[TILEBACK_COLOR] );
SetTextColor( hdc, dctx->colors[getPlayerColor(dctx->trayOwner)] );
XPRtoRECT( &rt, xprect ); XPRtoRECT( &rt, xprect );
InsetRect( &rt, 1, 1 ); InsetRect( &rt, 1, 1 );
Rectangle(hdc, rt.left, rt.top, rt.right, rt.bottom); Rectangle(hdc, rt.left, rt.top, rt.right, rt.bottom);
InsetRect( &rt, 1, 1 ); InsetRect( &rt, 1, 1 );
FillRect( hdc, &rt, dctx->brushes[TILEBACK_COLOR] ); /* For some reason Rectangle isn't using the background brush to fill, so
SetBkColor( hdc, dctx->colors[TILEBACK_COLOR] ); FillRect has to get called after Rectangle. Need to call InsetRect
SetTextColor( hdc, dctx->colors[getPlayerColor(dctx->trayOwner)] ); either way to put chars in the right place. */
if ( highlighted ) { if ( highlighted ) {
Rectangle( hdc, rt.left, rt.top, rt.right, rt.bottom ); Rectangle( hdc, rt.left, rt.top, rt.right, rt.bottom );
}
InsetRect( &rt, 1, 1 ); InsetRect( &rt, 1, 1 );
}
FillRect( hdc, &rt, dctx->brushes[TILEBACK_COLOR] );
if ( !highlighted ) {
InsetRect( &rt, 1, 1 );
}
if ( !!letters ) { if ( !!letters ) {
HFONT oldFont = SelectObject( hdc, dctx->trayFont ); HFONT oldFont = SelectObject( hdc, dctx->trayFont );
@ -413,7 +419,6 @@ formatRemText( HDC hdc, wchar_t* buf, XP_S16 nTilesLeft, SIZE* size )
swprintf( buf, format, nTilesLeft ); swprintf( buf, format, nTilesLeft );
GetTextExtentPoint32( hdc, buf, wcslen(buf), size ); GetTextExtentPoint32( hdc, buf, wcslen(buf), size );
} }
} /* formatRemText */ } /* formatRemText */
static void static void
@ -429,7 +434,7 @@ ce_draw_measureRemText( DrawCtx* p_dctx, XP_Rect* r,
formatRemText( hdc, buf, nTilesLeft, &size ); formatRemText( hdc, buf, nTilesLeft, &size );
*width = (XP_U16)size.cx; *width = (XP_U16)size.cx + 1; /* 1: don't write up against edge */
*height = (XP_U16)size.cy; *height = (XP_U16)size.cy;
} /* ce_draw_measureRemText */ } /* ce_draw_measureRemText */
@ -447,6 +452,7 @@ ce_draw_drawRemText( DrawCtx* p_dctx, XP_Rect* rInner, XP_Rect* rOuter,
formatRemText( hdc, buf, nTilesLeft, &size ); formatRemText( hdc, buf, nTilesLeft, &size );
XPRtoRECT( &rt, rInner ); XPRtoRECT( &rt, rInner );
++rt.left; /* 1: don't write up against edge */
DrawText( hdc, buf, -1, &rt, DT_SINGLELINE | DT_LEFT | DT_VCENTER); DrawText( hdc, buf, -1, &rt, DT_SINGLELINE | DT_LEFT | DT_VCENTER);
return (XP_U16)size.cx; return (XP_U16)size.cx;