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.h | |
| 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.h')
| -rw-r--r-- | src/displayapp/screens/Tile.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h index 7edf67b2..55ed45e3 100644 --- a/src/displayapp/screens/Tile.h +++ b/src/displayapp/screens/Tile.h @@ -3,7 +3,6 @@ #include <lvgl/lvgl.h> #include <cstdint> #include <memory> -#include "Modal.h" #include "Screen.h" #include "../Apps.h" @@ -29,8 +28,6 @@ namespace Pinetime { lv_obj_t * btnm1; bool running = true; - std::unique_ptr<Modal> modal; - const char* btnm_map1[8]; Pinetime::Applications::Apps apps[6]; }; |