From 025f900833838f9312a78ed7422b9f36a4e58300 Mon Sep 17 00:00:00 2001
From: Michele Bini <michele.bini@gmail.com>
Date: Wed, 11 May 2022 21:50:02 +0200
Subject: Fix font for terminal watchface


diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp
index 00f4b60..65368c5 100644
--- a/src/displayapp/screens/WatchFaceTerminal.cpp
+++ b/src/displayapp/screens/WatchFaceTerminal.cpp
@@ -72,6 +72,10 @@ WatchFaceTerminal::WatchFaceTerminal(DisplayApp* app,
   lv_label_set_recolor(stepValue, true);
   lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 0);
 
+  for (auto line : lines) {
+    lv_obj_set_style_local_text_font( line, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &neofont15mono);
+  }
+
   taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
   Refresh();
 }
diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h
index d236da3..46cdaaf 100644
--- a/src/displayapp/screens/WatchFaceTerminal.h
+++ b/src/displayapp/screens/WatchFaceTerminal.h
@@ -55,16 +55,21 @@ namespace Pinetime {
         DirtyValue<bool> heartbeatRunning {};
         DirtyValue<bool> notificationState {};
 
-        lv_obj_t* label_time;
-        lv_obj_t* label_date;
-        lv_obj_t* label_prompt_1;
-        lv_obj_t* label_prompt_2;
+        union {
+          struct {
+            lv_obj_t* label_time;
+            lv_obj_t* label_date;
+            lv_obj_t* label_prompt_1;
+            lv_obj_t* label_prompt_2;
+            lv_obj_t* batteryValue;
+            lv_obj_t* heartbeatValue;
+            lv_obj_t* stepValue;
+            lv_obj_t* connectState;
+          };
+          lv_obj_t *lines[8];
+        };
         lv_obj_t* backgroundLabel;
-        lv_obj_t* batteryValue;
-        lv_obj_t* heartbeatValue;
-        lv_obj_t* stepValue;
         lv_obj_t* notificationIcon;
-        lv_obj_t* connectState;
 
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index eece755..ff38aec 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -416,6 +416,7 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
 #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont0)  \
                                LV_FONT_DECLARE(neofont1)  \
                                LV_FONT_DECLARE(neofont15) \
+                               LV_FONT_DECLARE(neofont15mono) \
                                LV_FONT_DECLARE(neofont2) \
                                LV_FONT_DECLARE(neofont3)
 
-- 
cgit v0.10.2