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 | |
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 'apps')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 1 | ||||
-rw-r--r-- | apps/gui/viewport.c | 4 | ||||
-rw-r--r-- | apps/menus/time_menu.c | 2 |
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) | |||
1694 | 1694 | ||
1695 | /* finally, assign the font_id to the viewport */ | 1695 | /* finally, assign the font_id to the viewport */ |
1696 | vp->font = font->id; | 1696 | vp->font = font->id; |
1697 | vp->line_height = font_get(vp->font)->height; | ||
1698 | } | 1697 | } |
1699 | data->font_ids = skin_buffer_alloc(font_count * sizeof(int)); | 1698 | data->font_ids = skin_buffer_alloc(font_count * sizeof(int)); |
1700 | if (!success || data->font_ids == NULL) | 1699 | 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) | |||
223 | int viewport_get_nb_lines(const struct viewport *vp) | 223 | int viewport_get_nb_lines(const struct viewport *vp) |
224 | { | 224 | { |
225 | #ifdef HAVE_LCD_BITMAP | 225 | #ifdef HAVE_LCD_BITMAP |
226 | if (!vp->line_height) | ||
227 | return vp->height/font_get(vp->font)->height; | ||
226 | return vp->height/vp->line_height; | 228 | return vp->height/vp->line_height; |
227 | #else | 229 | #else |
228 | (void)vp; | 230 | (void)vp; |
@@ -318,7 +320,7 @@ void viewport_set_fullscreen(struct viewport *vp, | |||
318 | set_default_align_flags(vp); | 320 | set_default_align_flags(vp); |
319 | #endif | 321 | #endif |
320 | vp->font = global_status.font_id[screen]; | 322 | vp->font = global_status.font_id[screen]; |
321 | vp->line_height = font_get(vp->font)->height; | 323 | vp->line_height = 0; /* calculate from font height */ |
322 | vp->drawmode = DRMODE_SOLID; | 324 | vp->drawmode = DRMODE_SOLID; |
323 | #if LCD_DEPTH > 1 | 325 | #if LCD_DEPTH > 1 |
324 | #ifdef HAVE_REMOTE_LCD | 326 | #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) | |||
269 | /* force time to be drawn centered */ | 269 | /* force time to be drawn centered */ |
270 | clock_vps[i].flags |= VP_FLAG_ALIGN_CENTER; | 270 | clock_vps[i].flags |= VP_FLAG_ALIGN_CENTER; |
271 | 271 | ||
272 | font_h = clock_vps[i].line_height; | 272 | font_h = clock_vps[i].line_height ?: (int)font_get(clock_vps[i].font)->height; |
273 | nb_lines -= 2; /* at least 2 lines for menu */ | 273 | nb_lines -= 2; /* at least 2 lines for menu */ |
274 | if (nb_lines > 4) | 274 | if (nb_lines > 4) |
275 | nb_lines = 4; | 275 | nb_lines = 4; |