aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/screens/Tile.cpp
diff options
context:
space:
mode:
authorJean-François Milants <jf@codingfield.com>2021-02-23 21:25:43 +0100
committerJean-François Milants <jf@codingfield.com>2021-02-23 21:25:43 +0100
commit67c545b1fbd368b99b111a1822fe8da815468e76 (patch)
tree0bcb047f3e9d5c41c6d79b4dac6cbcdd3929136b /src/displayapp/screens/Tile.cpp
parent324c7dab326ea23a6c8502bbb8c6e9b9d87a839f (diff)
parentb11b20b0ac5c0adfbd1397cf42c322c873a736a8 (diff)
Merge branch 'joaquimorg-LVGL7' into develop
Diffstat (limited to 'src/displayapp/screens/Tile.cpp')
-rw-r--r--src/displayapp/screens/Tile.cpp6
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;