From 56f315b94acc45e2175e030fca31cf8b56e36b93 Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Tue, 27 Sep 2022 18:06:15 +0200 Subject: A few minors changes following the code review : rename fs -> filesystem, use std::array instead of raw array,... --- src/displayapp/screens/CheckboxList.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/displayapp/screens/CheckboxList.h') diff --git a/src/displayapp/screens/CheckboxList.h b/src/displayapp/screens/CheckboxList.h index 6660acde..68280edd 100644 --- a/src/displayapp/screens/CheckboxList.h +++ b/src/displayapp/screens/CheckboxList.h @@ -14,6 +14,8 @@ namespace Pinetime { namespace Screens { class CheckboxList : public Screen { public: + static constexpr size_t MaxItems = 4; + CheckboxList(const uint8_t screenID, const uint8_t numScreens, DisplayApp* app, @@ -22,7 +24,7 @@ namespace Pinetime { const char* optionsSymbol, void (Controllers::Settings::*SetOptionIndex)(uint8_t), uint8_t (Controllers::Settings::*GetOptionIndex)() const, - std::array options); + std::array options); ~CheckboxList() override; @@ -35,12 +37,10 @@ namespace Pinetime { const char* optionsSymbol; void (Controllers::Settings::*SetOptionIndex)(uint8_t); uint8_t (Controllers::Settings::*GetOptionIndex)() const; - std::array options; - - lv_obj_t* cbOption[MAXLISTITEMS]; - - lv_point_t pageIndicatorBasePoints[2]; - lv_point_t pageIndicatorPoints[2]; + std::array options; + std::array cbOption; + std::array pageIndicatorBasePoints; + std::array pageIndicatorPoints; lv_obj_t* pageIndicatorBase; lv_obj_t* pageIndicator; }; -- cgit v1.2.3-70-g09d2