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

for REM rect too place innerRect centered in outerRect

Browse source
This commit is contained in:
ehouse 2009-11-15 15:45:50 +00:00
parent 61e087fbfe
commit 7966f20829
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
xwords4/common/scorebdp.c
View file

@ -37,6 +37,17 @@ board_ScoreCallback( void* closure, XP_S16 player, XP_UCHAR* expl,
expl, explLen ); expl, explLen );
} /* board_ScoreCallback */ } /* board_ScoreCallback */
static void
centerIn( XP_Rect* rInner, const XP_Rect* rOuter, XP_U16 width, XP_U16 height )
{
rInner->width = width;
rInner->height = height;
XP_ASSERT( width <= rOuter->width );
rInner->left = rOuter->left + ( (rOuter->width - width) / 2 );
XP_ASSERT( height <= rOuter->height );
rInner->top = rOuter->top + ( (rOuter->height - height) / 2 );
}
typedef struct DrawScoreData { typedef struct DrawScoreData {
DrawScoreInfo dsi; DrawScoreInfo dsi;
XP_U16 height; XP_U16 height;
@ -183,9 +194,10 @@ drawScoreBoard( BoardCtxt* board )
scoreboard rect's upper left. */ scoreboard rect's upper left. */
if ( remDim > 0 ) { if ( remDim > 0 ) {
XP_Rect innerRect;
*adjustDim = remDim; *adjustDim = remDim;
centerIn( &innerRect, &scoreRect, remWidth, remHeight );
draw_drawRemText( board->draw, &scoreRect, &scoreRect, draw_drawRemText( board->draw, &innerRect, &scoreRect,
nTilesInPool, focusAll || remFocussed ); nTilesInPool, focusAll || remFocussed );
board->remRect = scoreRect; board->remRect = scoreRect;
*adjustPt += remDim; *adjustPt += remDim;
@ -203,13 +215,7 @@ drawScoreBoard( BoardCtxt* board )
XP_U16 dim = isVertical? dp->height:dp->width; XP_U16 dim = isVertical? dp->height:dp->width;
*adjustDim = board->pti[ii].scoreDims = dim + extra; *adjustDim = board->pti[ii].scoreDims = dim + extra;
innerRect.width = dp->width; centerIn( &innerRect, &scoreRect, dp->width, dp->height );
innerRect.height = dp->height;
innerRect.left = scoreRect.left +
((scoreRect.width - innerRect.width) / 2);
innerRect.top = scoreRect.top +
((scoreRect.height - innerRect.height) / 2);
draw_score_drawPlayer( board->draw, &innerRect, &scoreRect, draw_score_drawPlayer( board->draw, &innerRect, &scoreRect,
&dp->dsi ); &dp->dsi );
#ifdef KEYBOARD_NAV #ifdef KEYBOARD_NAV