len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better fix for FS#12337. Use 0 to make the line height calculated from the font height, as before r30773.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30850 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-10-29 15:16:02 +00:00
parent 9fe029b12a
commit 93c6c79e8d
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/drivers/lcd-bitmap-common.c
View file

@ -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;

2
firmware/export/lcd.h
View file

@ -43,7 +43,7 @@ struct viewport {
#ifdef HAVE_LCD_BITMAP
int flags;
int font;
int line_height;
int line_height; /* 0 for using font height */
int drawmode;
#endif
#if LCD_DEPTH > 1