diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-03-07 08:44:14 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-03-07 08:44:14 +0100 |
commit | 9f67e6f6525bd4071609ff9edd6ce132d7ca1464 (patch) | |
tree | 65b2dc22bb257c6dd4fc8be77762173b564c340c /src/displayapp/screens/Tile.cpp | |
parent | 740b3d7b58dd92a6a6f99620a090ae4f05c03299 (diff) | |
parent | ada942535718d48eec37cca4f50d678e7201dc67 (diff) |
Merge branch 'develop' into recovery-firmware
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.h
# src/systemtask/SystemTask.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/displayapp/screens/Tile.cpp')
-rw-r--r-- | src/displayapp/screens/Tile.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp index c1a5e94f..3b82b060 100644 --- a/src/displayapp/screens/Tile.cpp +++ b/src/displayapp/screens/Tile.cpp @@ -3,8 +3,6 @@ using namespace Pinetime::Applications::Screens; -extern lv_font_t jetbrains_mono_bold_20; - static void event_handler(lv_obj_t * obj, lv_event_t event) { Tile* screen = static_cast<Tile *>(obj->user_data); uint32_t* eventDataPtr = (uint32_t*) lv_event_get_data(); @@ -22,10 +20,9 @@ Tile::Tile(DisplayApp* app, std::array<Applications, 6>& applications) : Screen( appIndex++; } } - modal.reset(new Modal(app)); - btnm1 = lv_btnm_create(lv_scr_act(), nullptr); - lv_btnm_set_map(btnm1, btnm_map1); + btnm1 = lv_btnmatrix_create(lv_scr_act(), nullptr); + lv_btnmatrix_set_map(btnm1, btnm_map1); lv_obj_set_size(btnm1, LV_HOR_RES, LV_VER_RES); btnm1->user_data = this; |