diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2023-11-08 20:52:37 +0100 |
|---|---|---|
| committer | JF <JF002@users.noreply.github.com> | 2023-11-11 18:07:07 +0100 |
| commit | d930fd4fa2be3f8570f85fe17d7cc0208c2eb4ec (patch) | |
| tree | 9a721ef6e364d37c6b431a71229e2acd6b04ea75 | |
| parent | e6b96c286376454b0aeab3c1444f4d106d755b94 (diff) | |
Initial commit
| -rw-r--r-- | src/displayapp/fonts/fonts.json | 2 | ||||
| -rw-r--r-- | src/displayapp/screens/Navigation.cpp | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json index bcfc365f..8416fc5e 100644 --- a/src/displayapp/fonts/fonts.json +++ b/src/displayapp/fonts/fonts.json @@ -18,7 +18,7 @@ "sources": [ { "file": "JetBrainsMono-Regular.ttf", - "range": "0x25, 0x2b, 0x2d, 0x30-0x3a" + "range": "0x25, 0x2b, 0x2d, 0x30-0x3a, 0x4b-0x4d, 0x66, 0x69, 0x6b, 0x6d, 0x74" } ], "bpp": 1, diff --git a/src/displayapp/screens/Navigation.cpp b/src/displayapp/screens/Navigation.cpp index 799ac8a9..2985ee65 100644 --- a/src/displayapp/screens/Navigation.cpp +++ b/src/displayapp/screens/Navigation.cpp @@ -203,19 +203,23 @@ Navigation::Navigation(Pinetime::Controllers::NavigationService& nav) : navServi lv_obj_align(imgFlag, nullptr, LV_ALIGN_CENTER, 0, -60); txtNarrative = lv_label_create(lv_scr_act(), nullptr); - lv_label_set_long_mode(txtNarrative, LV_LABEL_LONG_BREAK); + lv_label_set_long_mode(txtNarrative, LV_LABEL_LONG_DOT); lv_obj_set_width(txtNarrative, LV_HOR_RES); - lv_label_set_text_static(txtNarrative, "Navigation"); + lv_obj_set_height(txtNarrative, 80); + //lv_label_set_text_static(txtNarrative, "Navigation"); + lv_label_set_text(txtNarrative, "Navigation blah blah very long text really long road name etc etc etc"); lv_label_set_align(txtNarrative, LV_LABEL_ALIGN_CENTER); - lv_obj_align(txtNarrative, nullptr, LV_ALIGN_CENTER, 0, 10); + lv_obj_align(txtNarrative, nullptr, LV_ALIGN_CENTER, 0, 30); txtManDist = lv_label_create(lv_scr_act(), nullptr); lv_label_set_long_mode(txtManDist, LV_LABEL_LONG_BREAK); lv_obj_set_style_local_text_color(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GREEN); + lv_obj_set_style_local_text_font(txtManDist, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42); lv_obj_set_width(txtManDist, LV_HOR_RES); - lv_label_set_text_static(txtManDist, "--M"); + //lv_label_set_text_static(txtManDist, "--M"); + lv_label_set_text_static(txtManDist, "123m"); lv_label_set_align(txtManDist, LV_LABEL_ALIGN_CENTER); - lv_obj_align(txtManDist, nullptr, LV_ALIGN_CENTER, 0, 60); + lv_obj_align(txtManDist, nullptr, LV_ALIGN_CENTER, 0, 90); // Route Progress barProgress = lv_bar_create(lv_scr_act(), nullptr); |