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

Draw tray tile value very small in highres case.

Browse source
This commit is contained in:
ehouse 2004-10-30 19:25:23 +00:00
parent 03eeac1d30
commit 881e81425c
2 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
xwords4/palm/palmdraw.c
View file

@ -450,7 +450,6 @@ palm_draw_drawTile( DrawCtx* p_dctx, XP_Rect* rect,
char valBuf[3];
XP_Rect localR = *rect;
XP_U16 len, width;
WinHandle numberWin = dctx->numberWin;
XP_U16 doubler = 1;
#ifdef FEATURE_HIGHRES
@ -488,38 +487,54 @@ palm_draw_drawTile( DrawCtx* p_dctx, XP_Rect* rect,
}
if ( val >= 0 ) {
RectangleType numRect = {{0,0}, {NUMRECT_WIDTH*2, NUMRECT_HEIGHT*2}};
WinHandle curWind;
(void)StrPrintF( valBuf, "%d", val );
len = XP_STRLEN((const char*)valBuf);
XP_ASSERT( !!numberWin );
curWind = WinSetDrawWindow( numberWin );
HIGHRES_PUSH_LOC( dctx );
if ( dctx->doHiRes ) {
UInt32 oldMode = WinSetScalingMode( kTextScalingOff );
FontID curFont = FntGetFont();
FntSetFont( boldFont );
width = FntCharsWidth( (const char*)valBuf, len );
WinDrawChars( valBuf, len,
localR.left + localR.width - width,
localR.top + localR.height - dctx->fntHeight - 1 );
FntSetFont( curFont );
WinSetScalingMode( oldMode );
WinEraseRectangle( &numRect, 0 );
} else {
WinDrawChars( valBuf, len, 0, 0 );
width = FntCharsWidth( valBuf, len );
RectangleType numRect = {{0,0},
{NUMRECT_WIDTH*2, NUMRECT_HEIGHT*2}};
WinHandle curWind;
WinHandle numberWin = dctx->numberWin;
(void)WinSetDrawWindow( curWind );
XP_ASSERT( !!numberWin );
curWind = WinSetDrawWindow( numberWin );
HIGHRES_PUSH_LOC( dctx );
HIGHRES_POP_LOC(dctx);
WinEraseRectangle( &numRect, 0 );
numRect.extent.x = width;
WinDrawChars( valBuf, len, 0, 0 );
width = FntCharsWidth( valBuf, len );
(void)WinSetDrawWindow( curWind );
HIGHRES_POP_LOC(dctx);
numRect.extent.x = width;
#ifdef TILE_SUBSCRIPT
WinCopyRectangle( numberWin, 0, &numRect,
localR.left + localR.width - (width*doubler),
localR.top + localR.height - (10*doubler),
winOverlay );
WinCopyRectangle( numberWin, 0, &numRect,
localR.left + localR.width - (width*doubler),
localR.top + localR.height - (10*doubler),
winOverlay );
#else
WinCopyRectangle( numberWin, 0, &numRect,
localR.left + localR.width - width,
localR.top,
winOverlay );
WinCopyRectangle( numberWin, 0, &numRect,
localR.left + localR.width - width,
localR.top,
winOverlay );
#endif
}
}
WinDrawRectangleFrame( rectangleFrame, (RectangleType*)&localR );
@ -927,6 +942,7 @@ palm_draw_score_pendingScore( DrawCtx* p_dctx, XP_Rect* rect, XP_S16 score,
}
if ( rect->height >= PALM_TRAY_SCALEH ) {
str = (*dctx->getResStrFunc)( dctx->globals, STR_PTS );
WinDrawChars( (const char*)str,
XP_STRLEN((const char*)str), x, rect->top );
}
@ -1286,6 +1302,8 @@ palm_drawctxt_make( MPFORMAL GraphicsAbility able,
XP_MEMCPY( &dctx->u.bnw.valuePatterns[0], patBits, sizeof(patBits) );
}
dctx->fntHeight = FntBaseLine();
return (DrawCtx*)dctx;
} /* palm_drawctxt_make */

1
xwords4/palm/palmmain.h
View file

@ -70,6 +70,7 @@ typedef struct PalmDrawCtx {
WinHandle numberWin;
XP_S16 trayOwner;
XP_U16 fntHeight;
GraphicsAbility able;