summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-11-04 22:55:02 +0000
committerThomas Martitz <kugel@rockbox.org>2009-11-04 22:55:02 +0000
commitcc65afac0a04f58563e8f58e031dad54712039c6 (patch)
tree729a2a3e6a03719f9a2c1931e073beffa018c8fd
parent3bae42e9f9808c842fdf78eeda22496177aa1cdf (diff)
downloadrockbox-cc65afac0a04f58563e8f58e031dad54712039c6.zip
rockbox-cc65afac0a04f58563e8f58e031dad54712039c6.tar.gz
rockbox-cc65afac0a04f58563e8f58e031dad54712039c6.tar.bz2
rockbox-cc65afac0a04f58563e8f58e031dad54712039c6.tar.xz
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
-rw-r--r--apps/gui/viewport.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index b40f244..b14cbf6 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -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);