From 93c6c79e8d2ee39056afe7f8145b051d4a0e8d38 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sat, 29 Oct 2011 15:16:02 +0000 Subject: Better fix for FS#12337. Use 0 to make the line height calculated from the font height, as before r30773. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30850 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd-bitmap-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'firmware/drivers/lcd-bitmap-common.c') diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index fb49deb76b..878c08863b 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c @@ -453,7 +453,7 @@ void LCDFN(scroll_fn)(void) continue; LCDFN(set_viewport)(s->vp); - height = s->vp->line_height; + height = s->vp->line_height ?: (int)font_get(s->vp->font)->height; if (s->backward) s->offset -= LCDFN(scroll_info).step; -- cgit v1.2.3