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 /apps/gui | |
| parent | 9fe029b12a0828b247718fc89b08547b1ab916b5 (diff) | |
| download | rockbox-93c6c79e8d2ee39056afe7f8145b051d4a0e8d38.zip rockbox-93c6c79e8d2ee39056afe7f8145b051d4a0e8d38.tar.gz rockbox-93c6c79e8d2ee39056afe7f8145b051d4a0e8d38.tar.bz2 rockbox-93c6c79e8d2ee39056afe7f8145b051d4a0e8d38.tar.xz | |
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 'apps/gui')
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 1 | ||||
| -rw-r--r-- | apps/gui/viewport.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index a9689a8..1557783 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -1694,7 +1694,6 @@ static bool skin_load_fonts(struct wps_data *data) /* finally, assign the font_id to the viewport */ vp->font = font->id; - vp->line_height = font_get(vp->font)->height; } data->font_ids = skin_buffer_alloc(font_count * sizeof(int)); if (!success || data->font_ids == NULL) diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index c5e4427..33ffed7 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c @@ -223,6 +223,8 @@ static bool is_theme_enabled(enum screen_type screen) int viewport_get_nb_lines(const struct viewport *vp) { #ifdef HAVE_LCD_BITMAP + if (!vp->line_height) + return vp->height/font_get(vp->font)->height; return vp->height/vp->line_height; #else (void)vp; @@ -318,7 +320,7 @@ void viewport_set_fullscreen(struct viewport *vp, set_default_align_flags(vp); #endif vp->font = global_status.font_id[screen]; - vp->line_height = font_get(vp->font)->height; + vp->line_height = 0; /* calculate from font height */ vp->drawmode = DRMODE_SOLID; #if LCD_DEPTH > 1 #ifdef HAVE_REMOTE_LCD |