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

3 files changed, 3 insertions, 7 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)
 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;
+    return vp->height/font_get(vp->font)->height;
 #else
     (void)vp;
     return 2;
@@ -322,7 +320,6 @@ void viewport_set_fullscreen(struct viewport *vp,
     set_default_align_flags(vp);
 #endif
     vp->font = screens[screen].getuifont();
-    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 1eb4bd68cc..9ef4f7323c 100644
--- a/apps/menus/time_menu.c
+++ b/apps/menus/time_menu.c
@@ -265,7 +265,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 ?: (int)font_get(clock_vps[i].font)->height;
+        font_h = font_get(clock_vps[i].font)->height;
         nb_lines -= 2; /* at least 2 lines for menu */
         if (nb_lines > 4)
             nb_lines = 4;
diff --git a/apps/plugins/lib/pluginlib_touchscreen.c b/apps/plugins/lib/pluginlib_touchscreen.c
index 095750740e..5903b7c7a9 100644
--- a/apps/plugins/lib/pluginlib_touchscreen.c
+++ b/apps/plugins/lib/pluginlib_touchscreen.c
@@ -140,8 +140,7 @@ void touchbutton_draw(struct touchbutton *data, int num_buttons) {
              */
             lcd->set_viewport(&data[i].vp);
 
-            /* Set line_height to height, then it'll center for us */
-            data[i].vp.line_height = data[i].vp.height;
+            /* TODO: Center text vert*/
             data[i].vp.flags |= VP_FLAG_ALIGN_CENTER;
             
             /* If the width offset was 0, use a scrolling puts, else center and