summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-11-10 23:01:01 +0000
committerThomas Martitz <kugel@rockbox.org>2009-11-10 23:01:01 +0000
commit6db8f952dc3ea8ee315159e5de1d7bea4c9a6530 (patch)
tree4857771ec3059695ca6d65dcd0e24fb2a3c2b590 /apps/gui
parentc5b4482ee2468c0e40da4441ddf429c890b5a291 (diff)
Fall back to info vp from sbs when intersection fails (again, r23575 changed it despite it was agreed on info vp beforehand).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23604 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-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 5f999df961..8e00ea3a71 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -388,10 +388,10 @@ void viewport_set_defaults(struct viewport *vp,
vp->height = MIN(a->y + a->height, b->y + b->height) - vp->y;
return;
}
- else /* They don't overlap, so the best wrong answer is show fullscreen */
- viewport_set_fullscreen(vp, screen);
-
+ /* else (no overlap at all) fall back to info vp from sbs, that
+ * has no redraw problems */
}
+
/* 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 */