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

Pick fonts for tray and board based on sizes at runtime; bury tile

Browse source 
values menuitem.
This commit is contained in:
ehouse 2008-03-16 14:23:57 +00:00
parent a69092bc53
commit 996e88a575
3 changed files with 52 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
xwords4/wince/cedraw.c
View file

@ -151,6 +151,27 @@ ERROR
#endif
} /* ceClipToRect */
static HFONT
ceGetSizedFont( CEDrawCtx* dctx, XP_U16 height, RFIndex index )
{
if ( dctx->setFontHt[index] != height ) {
HFONT font;
LOGFONT fontInfo;
XP_MEMSET( &fontInfo, 0, sizeof(fontInfo) );
fontInfo.lfHeight = height;
font = CreateFontIndirect( &fontInfo );
if ( !!dctx->setFont[index] ) {
DeleteObject( dctx->setFont[index] );
}
dctx->setFont[index] = font;
dctx->setFontHt[index] = height;
}
return dctx->setFont[index];
}
static void
measureText( CEDrawCtx* dctx, const XP_UCHAR* str, XP_S16 padding,
XP_U16* widthP, XP_U16* heightP )
@ -287,7 +308,6 @@ ceDrawHintBorders( HDC hdc, const XP_Rect* xprect, HintAtts hintAtts )
}
} /* ceDrawHintBorders */
DLSTATIC XP_Bool
DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
const XP_UCHAR* letters, const XP_Bitmap bitmap,
@ -306,9 +326,13 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
XP_Bool isPending = (flags & CELL_HIGHLIGHT) != 0;
XP_Bool isFocussed = (flags & CELL_ISCURSOR) != 0;
XP_Bool isDragSrc = (flags & CELL_DRAGSRC) != 0;
HFONT oldFont;
XP_ASSERT( !!hdc );
oldFont = SelectObject( hdc, ceGetSizedFont( dctx, xprect->height,
RFONTS_CELL) );
XPRtoRECT( &rt, xprect );
++rt.bottom;
++rt.right;
@ -389,6 +413,8 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
ceDrawHintBorders( hdc, xprect, hintAtts );
SelectObject( hdc, oldFont );
return XP_TRUE;
} /* ce_draw_drawCell */
@ -476,12 +502,15 @@ drawDrawTileGuts( DrawCtx* p_dctx, const XP_Rect* xprect,
FillRect( hdc, &rt, dctx->brushes[backIndex] );
if ( !isEmpty ) {
XP_U16 thirdHt = xprect->height / 3;
if ( !highlighted ) {
InsetRect( &rt, 1, 1 );
}
if ( !!letters ) {
HFONT oldFont = SelectObject( hdc, dctx->trayFont );
HFONT font = ceGetSizedFont( dctx, thirdHt*2,
RFONTS_TRAY );
HFONT oldFont = SelectObject( hdc, font );
MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, letters, -1,
widebuf,
VSIZE(widebuf) );
@ -499,9 +528,13 @@ drawDrawTileGuts( DrawCtx* p_dctx, const XP_Rect* xprect,
}
if ( val >= 0 ) {
HFONT font = ceGetSizedFont( dctx, thirdHt,
RFONTS_TRAYVAL );
HFONT oldFont = SelectObject( hdc, font );
swprintf( widebuf, L"%d", val );
DrawText(hdc, widebuf, -1, &rt,
DT_SINGLELINE | DT_BOTTOM | DT_RIGHT);
SelectObject( hdc, oldFont );
}
}
}
@ -991,9 +1024,13 @@ DRAW_FUNC_NAME(destroyCtxt)( DrawCtx* p_dctx )
DeleteObject( dctx->brushes[i] );
}
DeleteObject( dctx->trayFont );
DeleteObject( dctx->playerFont );
DeleteObject( dctx->selPlayerFont );
for ( i = 0; i < N_RESIZE_FONTS; ++i ) {
if ( !!dctx->setFont[i] ) {
DeleteObject( dctx->setFont[i] );
}
}
DeleteObject( dctx->rightArrow );
DeleteObject( dctx->downArrow );
@ -1061,10 +1098,7 @@ ceFontsSetup( CEDrawCtx* dctx )
LOGFONT font;
XP_MEMSET( &font, 0, sizeof(font) );
font.lfHeight = (CE_TRAY_SCALEV*2)/3;
font.lfWeight = 600; /* FW_DEMIBOLD */
wcscpy( font.lfFaceName, L"Arial" );
dctx->trayFont = CreateFontIndirect( &font );
font.lfWeight = FW_LIGHT;
font.lfHeight = CE_SCORE_HEIGHT - 2;
@ -1073,7 +1107,6 @@ ceFontsSetup( CEDrawCtx* dctx )
font.lfWeight = FW_BOLD;
font.lfHeight = CE_SCORE_HEIGHT;
dctx->selPlayerFont = CreateFontIndirect( &font );
} /* ceFontsSetup */
void

11
xwords4/wince/cemain.h
View file

@ -168,6 +168,14 @@ enum {
#define CE_NUM_EDITABLE_COLORS CE_BLACK_COLOR
typedef enum {
RFONTS_TRAY
,RFONTS_TRAYVAL
,RFONTS_CELL
,N_RESIZE_FONTS
} RFIndex;
typedef struct CEDrawCtx {
DrawCtxVTable* vtable;
@ -178,9 +186,10 @@ typedef struct CEDrawCtx {
HBRUSH brushes[CE_NUM_COLORS];
HFONT trayFont;
HFONT selPlayerFont;
HFONT playerFont;
HFONT setFont[N_RESIZE_FONTS];
XP_U16 setFontHt[N_RESIZE_FONTS];
HBITMAP rightArrow;
HBITMAP downArrow;

3
xwords4/wince/xwords4.rc
View file

@ -81,7 +81,6 @@ BEGIN
MENUITEM "Flip", ID_MOVE_FLIP
MENUITEM "Trade", ID_MOVE_TRADE
MENUITEM "(un)Hide tray", ID_MOVE_HIDETRAY
MENUITEM "Tile values", ID_MOVE_VALUES
POPUP "Undo"
BEGIN
@ -96,6 +95,8 @@ BEGIN
#ifdef XWFEATURE_SEARCHLIMIT
MENUITEM "Limited hint", ID_MOVE_LIMITEDHINT
#endif
MENUITEM SEPARATOR
MENUITEM "Tile values", ID_MOVE_VALUES
END
POPUP "Game"