diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2022-07-05 05:41:09 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-07-17 22:20:00 (GMT) |
| commit | 5b63756ef83288aea93db1800e3f6b6f89944092 (patch) | |
| tree | 800abef39991dbd61d9d39575e7d2698e6096621 /src/displayapp/screens/Label.cpp | |
| parent | 59cc1abf5fd977e21f7bc45292ce03e40cd37820 (diff) | |
Add PageIndicator widget to reduce code duplication (#1218)analog24
* Move PageIndicator widget to its own files to reduce code duplication
* Use uint8_t in PageIndicator
Diffstat (limited to 'src/displayapp/screens/Label.cpp')
| -rw-r--r-- | src/displayapp/screens/Label.cpp | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/displayapp/screens/Label.cpp b/src/displayapp/screens/Label.cpp index 4486d6f..d5a09be 100644 --- a/src/displayapp/screens/Label.cpp +++ b/src/displayapp/screens/Label.cpp @@ -3,34 +3,9 @@ using namespace Pinetime::Applications::Screens; Label::Label(uint8_t screenID, uint8_t numScreens, Pinetime::Applications::DisplayApp* app, lv_obj_t* labelText) - : Screen(app), labelText {labelText} { + : Screen(app), labelText {labelText}, pageIndicator(screenID, numScreens) { - if (numScreens > 1) { - pageIndicatorBasePoints[0].x = LV_HOR_RES - 1; - pageIndicatorBasePoints[0].y = 0; - pageIndicatorBasePoints[1].x = LV_HOR_RES - 1; - pageIndicatorBasePoints[1].y = LV_VER_RES; - - 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_obj_set_style_local_line_rounded(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, true); - lv_line_set_points(pageIndicatorBase, pageIndicatorBasePoints, 2); - - uint16_t indicatorSize = LV_VER_RES / numScreens; - uint16_t indicatorPos = indicatorSize * screenID; - - pageIndicatorPoints[0].x = LV_HOR_RES - 1; - pageIndicatorPoints[0].y = indicatorPos; - pageIndicatorPoints[1].x = LV_HOR_RES - 1; - pageIndicatorPoints[1].y = indicatorPos + indicatorSize; - - 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_MAKE(0xb0, 0xb0, 0xb0)); - lv_obj_set_style_local_line_rounded(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, true); - lv_line_set_points(pageIndicator, pageIndicatorPoints, 2); - } + pageIndicator.Create(); } Label::~Label() { |