summaryrefslogtreecommitdiffstats
path: root/apps/menus
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/menus
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/menus')
-rw-r--r--apps/menus/time_menu.c2
1 files changed, 1 insertions, 1 deletions
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;