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

for vertical scoreboards, force miniwindow to be entirely inside the board.

Browse source
This commit is contained in:
ehouse 2006-05-14 15:27:29 +00:00
parent e98ef5b962
commit bb7e827703
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/common/board.c
View file

@ -682,6 +682,7 @@ positionMiniWRect( BoardCtxt* board, XP_Rect* rect, XP_Bool center )
} else { } else {
rect->left = x - rect->width > 0? x - rect->width : x; rect->left = x - rect->width > 0? x - rect->width : x;
} }
rect->left = XP_MAX( board->boardBounds.left + 1, rect->left );
rect->top = XP_MAX( board->boardBounds.top + 1, y - rect->height ); rect->top = XP_MAX( board->boardBounds.top + 1, y - rect->height );
} }
} /* positionBonusRect */ } /* positionBonusRect */
@ -1291,7 +1292,8 @@ board_setTrayLoc( BoardCtxt* board, XP_U16 trayLeft, XP_U16 trayTop,
+ (board->boardVScale * model_numRows( board->model )); + (board->boardVScale * model_numRows( board->model ));
boardRight = board->boardBounds.left boardRight = board->boardBounds.left
+ (board->boardHScale * model_numCols( board->model )); + (board->boardHScale * model_numCols( board->model ));
board->boardObscuresTray = (trayTop < boardBottom) && (trayLeft < boardRight); board->boardObscuresTray = (trayTop < boardBottom)
&& (trayLeft < boardRight);
boardHidesTray = board->boardObscuresTray; boardHidesTray = board->boardObscuresTray;
if ( boardHidesTray ) { /* can't hide if doesn't obscure */ if ( boardHidesTray ) { /* can't hide if doesn't obscure */