Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tray cannot be exactly same height as cells as it has thicker borders.

Browse source 
Reserve that difference from calculation of cell height so tray will
pick it up later.
This commit is contained in:
ehouse 2008-10-26 15:01:05 +00:00
parent b684bb238a
commit a59c2456d5
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/wince/cemain.c
View file

@ -569,14 +569,21 @@ figureBoardParms( CEAppGlobals* globals, const XP_U16 nRows,
horiz = scrnHeight >= scrnWidth; horiz = scrnHeight >= scrnWidth;
} }
/* Scoreboard is same height as cells (less SCORE_TWEAK) */ /* vScale. Tray must be a few pixels taller than cells to use same
vScale = scrnHeight / (nRows + (horiz?2:1)); sized, minimum-sized font. Subtract out that difference here and it's
guaranteed that tray will wind up at least that much taller later
though for the rest of the calculation we reserve only a cell's height
for it. */
vScale = (scrnHeight - (MIN_TRAY_HEIGHT-MIN_CELL_HEIGHT))
/ (nRows + (horiz?2:1)); /* horiz means scoreboard *and* tray */
if ( vScale >= MIN_CELL_HEIGHT ) { if ( vScale >= MIN_CELL_HEIGHT ) {
nVisibleRows = nRows; nVisibleRows = nRows; /* no scrolling needed */
} else { } else {
XP_U16 nRowsPossible = (scrnHeight-MIN_TRAY_HEIGHT) / MIN_CELL_HEIGHT; XP_U16 nRowsPossible = (scrnHeight-MIN_TRAY_HEIGHT) / MIN_CELL_HEIGHT;
XP_S16 num2Scroll = (nRows + (horiz?1:0)) - nRowsPossible; /* 1: scoreboard */ XP_S16 num2Scroll;
if ( num2Scroll < 0 ) { num2Scroll = (nRows + (horiz?1:0)) - nRowsPossible; /* 1: scoreboard */
XP_ASSERT( num2Scroll > 0 );
if ( num2Scroll < 0 ) { /* no-scroll case should be caught above */
num2Scroll = 0; num2Scroll = 0;
} }
nVisibleRows = nRows - num2Scroll; nVisibleRows = nRows - num2Scroll;