diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2023-02-22 22:05:37 +0200 |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2023-02-25 16:56:03 +0200 |
| commit | 7c7a8602c473bc160506e064097bd9ecc204425b (patch) | |
| tree | 1731d2fa118ab899dd9107664122ab6fc4f0679b /src/displayapp/screens/ScreenList.h | |
| parent | e2d40847015006fb07ee23ea198df8c39b183b58 (diff) | |
screens: Remove displayapp parameter from screen
The DisplayApp class isn't used in the Screen base class and most
screens, so requiring it is pointless.
In this commit, DisplayApp pointers were added to screens which use it
and the explicit Screen constructor was removed in those screens.
Diffstat (limited to 'src/displayapp/screens/ScreenList.h')
| -rw-r--r-- | src/displayapp/screens/ScreenList.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h index 255544b6..78f32314 100644 --- a/src/displayapp/screens/ScreenList.h +++ b/src/displayapp/screens/ScreenList.h @@ -19,7 +19,7 @@ namespace Pinetime { uint8_t initScreen, const std::array<std::function<std::unique_ptr<Screen>()>, N>&& screens, ScreenListModes mode) - : Screen(app), + : app {app}, initScreen {initScreen}, screens {std::move(screens)}, mode {mode}, @@ -102,6 +102,7 @@ namespace Pinetime { } private: + DisplayApp* app; uint8_t initScreen = 0; const std::array<std::function<std::unique_ptr<Screen>()>, N> screens; ScreenListModes mode = ScreenListModes::UpDown; |
