diff options
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 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 |