diff options
author | Thomas Martitz <kugel@rockbox.org> | 2013-04-16 16:06:13 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-01-07 14:13:48 +0100 |
commit | 49780944809651f28e8135bf6d67dcd8ceeb2585 (patch) | |
tree | 4893467ebcf509eeab6990905511f40c852b7f03 /apps/gui | |
parent | 9a4686b563ac9e27615e1032792bd9878bb291f7 (diff) | |
download | rockbox-49780944809651f28e8135bf6d67dcd8ceeb2585.tar.gz rockbox-49780944809651f28e8135bf6d67dcd8ceeb2585.zip |
lcd-common: Remove support for custom line heights from viewport.
Since scrolling is now pixel-based this is not necessary anymore. custom line
height is handled by put_line() but can also possible to implement with
lcd_puts_scroll_func().
Change-Id: Iee9b12bf99afac93d95d2a1a6f5d5b4db237b21c
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/viewport.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index 0b5441e02b..b91c7441dd 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -225,9 +225,7 @@ static bool is_theme_enabled(enum screen_type screen) | |||
225 | int viewport_get_nb_lines(const struct viewport *vp) | 225 | int viewport_get_nb_lines(const struct viewport *vp) |
226 | { | 226 | { |
227 | #ifdef HAVE_LCD_BITMAP | 227 | #ifdef HAVE_LCD_BITMAP |
228 | if (!vp->line_height) | 228 | return vp->height/font_get(vp->font)->height; |
229 | return vp->height/font_get(vp->font)->height; | ||
230 | return vp->height/vp->line_height; | ||
231 | #else | 229 | #else |
232 | (void)vp; | 230 | (void)vp; |
233 | return 2; | 231 | return 2; |
@@ -322,7 +320,6 @@ void viewport_set_fullscreen(struct viewport *vp, | |||
322 | set_default_align_flags(vp); | 320 | set_default_align_flags(vp); |
323 | #endif | 321 | #endif |
324 | vp->font = screens[screen].getuifont(); | 322 | vp->font = screens[screen].getuifont(); |
325 | vp->line_height = 0; /* calculate from font height */ | ||
326 | vp->drawmode = DRMODE_SOLID; | 323 | vp->drawmode = DRMODE_SOLID; |
327 | #if LCD_DEPTH > 1 | 324 | #if LCD_DEPTH > 1 |
328 | #ifdef HAVE_REMOTE_LCD | 325 | #ifdef HAVE_REMOTE_LCD |