devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix a possiblity where viewport_set_default left the viewport unchanged. Improve comments a bit.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23521 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-11-04 21:08:21 +00:00
parent ea6178065c
commit e9c900d09d
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
apps/gui/viewport.c
View file

@ -379,22 +379,25 @@ void viewport_set_defaults(struct viewport *vp,
if (sbs_area && user_setting)
{
struct viewport *a = sbs_area, *b = user_setting;
/* make sure they do actually overlap,
* if they dont its user error, so use the full display
* and live with redraw problems */
/* if ui vp and info vp overlap, intersect */
if (a->x < b->x + b->width &&
a->x + a->width > b->x &&
a->y < b->y + b->height &&
a->y + a->height > b->y)
{
{ /* interesect so that the ui viewport is cropped so that it
* is completely within the info vp */
vp->x = MAX(a->x, b->x);
vp->y = MAX(a->y, b->y);
vp->width = MIN(a->x + a->width, b->x + b->width) - vp->x;
vp->height = MIN(a->y + a->height, b->y + b->height) - vp->y;
return;
}
/* else take info vp below */
}
/* only one so use it */
else if (sbs_area)
/* if only one is active use it
* or if the above check for overlapping failed, use info vp then, because
* that doesn't give redraw problems */
if (sbs_area)
*vp = *sbs_area;
else if (user_setting)
*vp = *user_setting;