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.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/displayapp/screens/CheckboxList.cpp') diff --git a/src/displayapp/screens/CheckboxList.cpp b/src/displayapp/screens/CheckboxList.cpp index 177a9718..d351a852 100644 --- a/src/displayapp/screens/CheckboxList.cpp +++ b/src/displayapp/screens/CheckboxList.cpp @@ -20,7 +20,7 @@ CheckboxList::CheckboxList(const uint8_t screenID, const char* optionsSymbol, void (Controllers::Settings::*SetOptionIndex)(uint8_t), uint8_t (Controllers::Settings::*GetOptionIndex)() const, - std::array options) + std::array options) : Screen(app), screenID {screenID}, settingsController {settingsController}, @@ -42,7 +42,7 @@ CheckboxList::CheckboxList(const uint8_t screenID, pageIndicatorBase = lv_line_create(lv_scr_act(), NULL); lv_obj_set_style_local_line_width(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3); lv_obj_set_style_local_line_color(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111)); - lv_line_set_points(pageIndicatorBase, pageIndicatorBasePoints, 2); + lv_line_set_points(pageIndicatorBase, pageIndicatorBasePoints.data(), 2); const uint16_t indicatorSize = LV_VER_RES / numScreens; const uint16_t indicatorPos = indicatorSize * screenID; @@ -55,7 +55,7 @@ CheckboxList::CheckboxList(const uint8_t screenID, pageIndicator = lv_line_create(lv_scr_act(), NULL); lv_obj_set_style_local_line_width(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3); lv_obj_set_style_local_line_color(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY); - lv_line_set_points(pageIndicator, pageIndicatorPoints, 2); + lv_line_set_points(pageIndicator, pageIndicatorPoints.data(), 2); } lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr); -- cgit v1.2.3