diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-11-04 22:55:02 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-11-04 22:55:02 +0000 |
commit | cc65afac0a04f58563e8f58e031dad54712039c6 (patch) | |
tree | 729a2a3e6a03719f9a2c1931e073beffa018c8fd | |
parent | 3bae42e9f9808c842fdf78eeda22496177aa1cdf (diff) | |
download | rockbox-cc65afac0a04f58563e8f58e031dad54712039c6.tar.gz rockbox-cc65afac0a04f58563e8f58e031dad54712039c6.zip |
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.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index b40f244ab2..b14cbf6649 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -384,7 +384,10 @@ void viewport_set_defaults(struct viewport *vp, | |||
384 | a->x + a->width > b->x && | 384 | a->x + a->width > b->x && |
385 | a->y < b->y + b->height && | 385 | a->y < b->y + b->height && |
386 | a->y + a->height > b->y) | 386 | a->y + a->height > b->y) |
387 | { /* interesect so that the ui viewport is cropped so that it | 387 | { |
388 | /* copy from ui vp first (for other field),fix coordinates after */ | ||
389 | *vp = *user_setting; | ||
390 | /* interesect so that the ui viewport is cropped so that it | ||
388 | * is completely within the info vp */ | 391 | * is completely within the info vp */ |
389 | vp->x = MAX(a->x, b->x); | 392 | vp->x = MAX(a->x, b->x); |
390 | vp->y = MAX(a->y, b->y); | 393 | vp->y = MAX(a->y, b->y); |