1
0
Fork 0
forked from len0rd/rockbox

Get font and colors from UI viewport before intersecting, instead of leaving them empty.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23526 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-11-04 22:55:02 +00:00
parent 3bae42e9f9
commit cc65afac0a

View file

@ -384,7 +384,10 @@ void viewport_set_defaults(struct viewport *vp,
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
{
/* copy from ui vp first (for other field),fix coordinates after */
*vp = *user_setting;
/* 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);