diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-02-23 21:18:59 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-02-23 21:18:59 +0100 |
| commit | f864330d355172046fab0923fd9015ec52884f00 (patch) | |
| tree | 0fd8743c9ea357d6f3ac61949292187113d3867f /src/displayapp/screens/Tile.cpp | |
| parent | 324c7dab326ea23a6c8502bbb8c6e9b9d87a839f (diff) | |
| parent | 3fe3f06299b37b99cad117e0ec726735acbdc721 (diff) | |
Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into joaquimorg-LVGL7
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.cpp
# src/displayapp/screens/Modal.cpp
# src/displayapp/screens/Modal.h
# src/displayapp/screens/Notifications.cpp
# src/displayapp/screens/Tile.h
Diffstat (limited to 'src/displayapp/screens/Tile.cpp')
| -rw-r--r-- | src/displayapp/screens/Tile.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp index 214d2736..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(); @@ -23,8 +21,8 @@ Tile::Tile(DisplayApp* app, std::array<Applications, 6>& applications) : Screen( } } - 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; |