CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update from JF comments to PR

Browse Source
This commit is contained in:
Joaquim
2021-03-06 19:55:53 +00:00
parent 3d6e8c3beb
commit 97deb43fb7
5 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/displayapp/screens/ScreenList.h
View File

@@ -15,26 +15,12 @@ namespace Pinetime {
class ScreenList : public Screen {
public:
ScreenList(
DisplayApp* app,
uint8_t initScreen,
std::array<std::function<std::unique_ptr<Screen>()>, N>&& screens,
ScreenListModes mode
)
: Screen(app),
initScreen{initScreen},
screens{std::move(screens)},
mode{mode},
current{this->screens[initScreen]()}
{
ScreenList(DisplayApp* app, uint8_t initScreen, std::array<std::function<std::unique_ptr<Screen>()>, N>&& screens, ScreenListModes mode)
: Screen(app), initScreen{initScreen}, screens{std::move(screens)}, mode{mode}, current{this->screens[initScreen]()} {
screenIndex = initScreen;
}
~ScreenList() override {
current.reset(nullptr);
/*for(uint8_t i = 0; i < screens.size(); i++) {
screens[i]().reset(nullptr);
}*/
lv_obj_clean(lv_scr_act());
}