summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-10-29 15:16:02 +0000
committerThomas Martitz <kugel@rockbox.org>2011-10-29 15:16:02 +0000
commit93c6c79e8d2ee39056afe7f8145b051d4a0e8d38 (patch)
tree283a6748c5bee4d0b2c1d2974e949b92963c5599 /apps
parent9fe029b12a0828b247718fc89b08547b1ab916b5 (diff)
downloadrockbox-93c6c79e8d2ee39056afe7f8145b051d4a0e8d38.tar.gz
rockbox-93c6c79e8d2ee39056afe7f8145b051d4a0e8d38.tar.bz2
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 'apps')
-rw-r--r--apps/gui/skin_engine/skin_parser.c1
-rw-r--r--apps/gui/viewport.c4
-rw-r--r--apps/menus/time_menu.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index a9689a8e00..1557783a7c 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 c5e44270d4..33ffed79f3 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
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c
index c4fe49aa49..9be335c8ee 100644
--- a/apps/menus/time_menu.c
+++ b/apps/menus/time_menu.c
@@ -269,7 +269,7 @@ int time_screen(void* ignored)
/* force time to be drawn centered */
clock_vps[i].flags |= VP_FLAG_ALIGN_CENTER;
- font_h = clock_vps[i].line_height;
+ font_h = clock_vps[i].line_height ?: (int)font_get(clock_vps[i].font)->height;
nb_lines -= 2; /* at least 2 lines for menu */
if (nb_lines > 4)
nb_lines = 4;