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

adjust yOffset same as x so we zoom in toward center; reduce xOffset

Browse source 
when zoom out makes it too big.
This commit is contained in:
eehouse 2010-04-08 04:15:16 +00:00
parent 1950e38bda
commit d01a30d1be
1 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
xwords4/common/board.c
View file

@ -526,6 +526,17 @@ board_getYOffset( const BoardCtxt* board )
return board->yOffset; return board->yOffset;
} /* board_getYOffset */ } /* board_getYOffset */
static XP_U16
adjustOffset( XP_U16 curOffset, XP_S16 zoomBy )
{
XP_S16 offset = curOffset;
offset += zoomBy / 2;
if ( offset < 0 ) {
offset = 0;
}
return offset;
}
XP_Bool XP_Bool
board_zoom( BoardCtxt* board, XP_S16 zoomBy ) board_zoom( BoardCtxt* board, XP_S16 zoomBy )
{ {
@ -548,14 +559,11 @@ board_zoom( BoardCtxt* board, XP_S16 zoomBy )
changed = zoomCount != board->zoomCount; changed = zoomCount != board->zoomCount;
if ( changed ) { if ( changed ) {
/* Try to distribute the zoom */ /* Try to distribute the zoom */
XP_S16 xOffset = board->xOffset; board->xOffset = adjustOffset( board->xOffset, zoomBy );
xOffset += zoomBy / 2; board->yOffset = adjustOffset( board->yOffset, zoomBy );
if ( xOffset < 0 ) {
xOffset = 0;
}
board->xOffset = xOffset;
board->zoomCount = zoomCount; board->zoomCount = zoomCount;
XP_LOGF( "set zoomCount: %d", zoomCount );
figureBoardRect( board ); figureBoardRect( board );
board_invalAll( board ); board_invalAll( board );
} }
@ -1226,7 +1234,6 @@ invalCellsUnderRect( BoardCtxt* board, const XP_Rect* rect )
for ( row = top; row <= bottom; ++row ) { for ( row = top; row <= bottom; ++row ) {
for ( col = left; col <= right; ++col ) { for ( col = left; col <= right; ++col ) {
XP_LOGF( "calling invalCell(%d,%d)", col, row );
invalCell( board, col, row ); invalCell( board, col, row );
} }
} }
@ -1625,7 +1632,11 @@ figureHScale( BoardCtxt* board )
XP_U16 nVisCols = nCols - board->zoomCount; XP_U16 nVisCols = nCols - board->zoomCount;
XP_U16 scale = board->boardBounds.width / nVisCols; XP_U16 scale = board->boardBounds.width / nVisCols;
XP_U16 spares = board->boardBounds.width % nVisCols; XP_U16 spares = board->boardBounds.width % nVisCols;
//XP_U16 edge, col;
XP_U16 maxOffset = nCols - nVisCols;
if ( board->xOffset > maxOffset ) {
board->xOffset = maxOffset;
}
board->lastVisibleCol = nCols - board->zoomCount + board->xOffset - 1; board->lastVisibleCol = nCols - board->zoomCount + board->xOffset - 1;
@ -1693,9 +1704,8 @@ figureBoardRect( BoardCtxt* board )
util_yOffsetChange( board->util, maxYOffset, oldYOffset, util_yOffsetChange( board->util, maxYOffset, oldYOffset,
board->yOffset ); board->yOffset );
} }
/* XP_LOGF( "%s: maxYOffset: %d; board->yOffset: %d", __func__, */
XP_LOGF( "%s: maxYOffset: %d; board->yOffset: %d", __func__, /* board->maxYOffset, board->yOffset ); */
board->maxYOffset, board->yOffset );
board->boardObscuresTray = !trayHidden; board->boardObscuresTray = !trayHidden;
extra = maxHeight % boardHScale; extra = maxHeight % boardHScale;
@ -1705,23 +1715,6 @@ figureBoardRect( BoardCtxt* board )
figureDims( board->rowHeights, VSIZE(board->rowHeights), nVisible, figureDims( board->rowHeights, VSIZE(board->rowHeights), nVisible,
board->boardVScale, extra ); board->boardVScale, extra );
/* if ( board->boardObscuresTray ) { */
/* if ( trayOnTop( board ) ) { */
/* boardBounds.height = board->trayBounds.top - boardBounds.top; */
/* } else { */
/* XP_U16 trayBottom; */
/* trayBottom = board->trayBounds.top + board->trayBounds.height; */
/* if ( trayBottom < boardBounds.top + boardBounds.height ) { */
/* boardBounds.height = trayBottom - boardBounds.top; */
/* } */
/* } */
/* } */
/* round down */
/* nVisible = boardBounds.height / boardScale; */
/* boardBounds.height = nVisible * boardScale; */
/* board->lastVisibleRow = nVisible + board->yOffset - 1; */
/* XP_ASSERT( board->lastVisibleRow < model_numRows(board->model) ); */
board->boardBounds = boardBounds; board->boardBounds = boardBounds;
} }
} /* figureBoardRect */ } /* figureBoardRect */