summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2009-11-09 05:15:48 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2009-11-09 05:15:48 +0000
commit4cd805cfaf88cee4b725b38f6a44b870f4c653e3 (patch)
treebb341231d25dae267fbb6266cd5f35f60db2d73d
parent892332ce87361e2a7a600ed85914d1f31769ec7d (diff)
downloadrockbox-4cd805cfaf88cee4b725b38f6a44b870f4c653e3.tar.gz
rockbox-4cd805cfaf88cee4b725b38f6a44b870f4c653e3.zip
Fix the error condition to actually set the fullscreen viewport. Also remove a comment which doesnt really add anything.. the comments 15lines above it explain whats happening
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23575 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/viewport.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index b14cbf6649..063f59cec6 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -387,15 +387,15 @@ void viewport_set_defaults(struct viewport *vp,
{
/* 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);
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 */
+ else /* They don't overlap, so the best wrong answer is show fullscreen */
+ viewport_set_fullscreen(vp, screen);
+
}
/* if only one is active use it
* or if the above check for overlapping failed, use info vp then, because