summaryrefslogtreecommitdiffstats
path: root/firmware/scroll_engine.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-07-02 09:55:01 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-07-02 09:55:01 +0000
commit4d2e91d252060de993fd9ef0359060913e543a37 (patch)
tree92597a66a0beb25a674f7ef14634df2fe11a90e2 /firmware/scroll_engine.c
parent88055b2f2e8059fdf6e146efcd8ebe8939eeea79 (diff)
downloadrockbox-4d2e91d252060de993fd9ef0359060913e543a37.tar.gz
rockbox-4d2e91d252060de993fd9ef0359060913e543a37.tar.bz2
rockbox-4d2e91d252060de993fd9ef0359060913e543a37.zip
fix red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17914 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/scroll_engine.c')
-rw-r--r--firmware/scroll_engine.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c
index 9607c90448..2b99c14daa 100644
--- a/firmware/scroll_engine.c
+++ b/firmware/scroll_engine.c
@@ -88,7 +88,11 @@ void lcd_stop_scroll(void)
static bool line_overlaps_viewport(struct viewport *lines_vp, int line,
struct viewport *othervp)
{
+#ifdef HAVE_LCD_BITMAP
int y = (font_get(lines_vp->font)->height*line) + lines_vp->y;
+#else
+ int y = lines_vp->y+line;
+#endif
if (y < othervp->y || y > othervp->y + othervp->height)
return false;
else if ((lines_vp->x + lines_vp->width < othervp->x) ||