diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-10-29 15:16:02 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-10-29 15:16:02 +0000 |
| commit | 93c6c79e8d2ee39056afe7f8145b051d4a0e8d38 (patch) | |
| tree | 283a6748c5bee4d0b2c1d2974e949b92963c5599 /firmware | |
| parent | 9fe029b12a0828b247718fc89b08547b1ab916b5 (diff) | |
| download | rockbox-93c6c79e8d2ee39056afe7f8145b051d4a0e8d38.tar.gz rockbox-93c6c79e8d2ee39056afe7f8145b051d4a0e8d38.zip | |
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
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 2 | ||||
| -rw-r--r-- | firmware/export/lcd.h | 2 |
2 files changed, 2 insertions, 2 deletions
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) | |||
| 453 | continue; | 453 | continue; |
| 454 | 454 | ||
| 455 | LCDFN(set_viewport)(s->vp); | 455 | LCDFN(set_viewport)(s->vp); |
| 456 | height = s->vp->line_height; | 456 | height = s->vp->line_height ?: (int)font_get(s->vp->font)->height; |
| 457 | 457 | ||
| 458 | if (s->backward) | 458 | if (s->backward) |
| 459 | s->offset -= LCDFN(scroll_info).step; | 459 | s->offset -= LCDFN(scroll_info).step; |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index e68795391f..f4336233ab 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
| @@ -43,7 +43,7 @@ struct viewport { | |||
| 43 | #ifdef HAVE_LCD_BITMAP | 43 | #ifdef HAVE_LCD_BITMAP |
| 44 | int flags; | 44 | int flags; |
| 45 | int font; | 45 | int font; |
| 46 | int line_height; | 46 | int line_height; /* 0 for using font height */ |
| 47 | int drawmode; | 47 | int drawmode; |
| 48 | #endif | 48 | #endif |
| 49 | #if LCD_DEPTH > 1 | 49 | #if LCD_DEPTH > 1 |