Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-20 22:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix hires scoreboard drawing

Browse source
This commit is contained in:
ehouse 2004-05-06 04:11:04 +00:00
parent 2ab5de6ea7
commit da3ef5ab6b
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
palm/palmdraw.c
View file

@ -681,6 +681,11 @@ palmMeasureDrawText( PalmDrawCtx* dctx, XP_Rect* bounds, XP_UCHAR* txt,
if ( vertical && isTurn ) { if ( vertical && isTurn ) {
height += 5; /* for the horizontal bars */ height += 5; /* for the horizontal bars */
} }
#ifdef FEATURE_HIGHRES
if ( dctx->doHiRes ) {
height *= 2;
}
#endif
XP_ASSERT( height <= bounds->height ); XP_ASSERT( height <= bounds->height );
XP_ASSERT( maxWidth <= bounds->width ); XP_ASSERT( maxWidth <= bounds->width );
@ -1009,7 +1014,20 @@ splitString( XP_UCHAR* str, XP_U16* nBufsP, XP_UCHAR** bufs )
} /* splitString */ } /* splitString */
#define VALUE_HINT_RECT_HEIGHT 12 #define VALUE_HINT_RECT_HEIGHT 12
#define VALUE_HINT_RECT_HEIGHT_HR 29 #define VALUE_HINT_RECT_HEIGHT_HR 24
static XP_U16
getMiniLineHt( PalmDrawCtx* dctx )
{
if ( 0 ) {
#ifdef FEATURE_HIGHRES
} else if ( dctx->doHiRes ) {
return VALUE_HINT_RECT_HEIGHT_HR;
#endif
} else {
return VALUE_HINT_RECT_HEIGHT;
}
} /* getMiniLineHt */
static void static void
palm_draw_measureMiniWText( DrawCtx* p_dctx, unsigned char* str, palm_draw_measureMiniWText( DrawCtx* p_dctx, unsigned char* str,
XP_U16* widthP, XP_U16* heightP ) XP_U16* widthP, XP_U16* heightP )
@ -1030,20 +1048,11 @@ palm_draw_measureMiniWText( DrawCtx* p_dctx, unsigned char* str,
XP_STRLEN(bufs[i]) ); XP_STRLEN(bufs[i]) );
maxWidth = XP_MAX( maxWidth, oneWidth ); maxWidth = XP_MAX( maxWidth, oneWidth );
height += VALUE_HINT_RECT_HEIGHT; height += getMiniLineHt((PalmDrawCtx*)p_dctx);
} }
*widthP = maxWidth; *widthP = maxWidth;
*heightP = height + 2; *heightP = height + 3;
/* if ( 0 ) { */
/* #ifdef FEATURE_HIGHRES */
/* } else if ( ((PalmDrawCtx*)p_dctx)->doHiRes ) { */
/* *heightP = VALUE_HINT_RECT_HEIGHT_HR; */
/* #endif */
/* } else { */
/* *heightP = VALUE_HINT_RECT_HEIGHT; */
/* } */
HIGHRES_POP_LOC( (PalmDrawCtx*)p_dctx ); HIGHRES_POP_LOC( (PalmDrawCtx*)p_dctx );
} /* palm_draw_measureMiniWText */ } /* palm_draw_measureMiniWText */
@ -1107,7 +1116,7 @@ palm_draw_drawMiniWindow( DrawCtx* p_dctx, unsigned char* text,
WinDrawChars( (const char*)txt, len, WinDrawChars( (const char*)txt, len,
localR.topLeft.x + ((localR.extent.x-width)/2), localR.topLeft.x + ((localR.extent.x-width)/2),
localR.topLeft.y + 1 + offset ); localR.topLeft.y + 1 + offset );
offset += VALUE_HINT_RECT_HEIGHT; offset += getMiniLineHt( dctx );
} }
HIGHRES_POP_LOC( dctx ); HIGHRES_POP_LOC( dctx );