diff options
| author | JF002 <JF002@users.noreply.github.com> | 2021-04-26 21:10:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 21:10:11 +0200 |
| commit | 4706c99db4c1e05f9dd90f152f2dea08d8f22ab2 (patch) | |
| tree | cf2bea6d67e8d91a7d6222b8e0b55a0075575003 /src/displayapp/screens/Label.cpp | |
| parent | e56ebb8bd621cc8838e86fa032d680a6e7a35ffc (diff) | |
| parent | 69898545193a82f7d72c9f47c9d9de36167b157b (diff) | |
Merge pull request #293 from Avamander/patch-5
Reformatted all the files according to clang-format style
Diffstat (limited to 'src/displayapp/screens/Label.cpp')
| -rw-r--r-- | src/displayapp/screens/Label.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/displayapp/screens/Label.cpp b/src/displayapp/screens/Label.cpp index cc268775..0132dbd2 100644 --- a/src/displayapp/screens/Label.cpp +++ b/src/displayapp/screens/Label.cpp @@ -2,24 +2,21 @@ 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} { - - if ( numScreens > 1 ) { +Label::Label(uint8_t screenID, uint8_t numScreens, Pinetime::Applications::DisplayApp* app, lv_obj_t* labelText) + : Screen(app), labelText {labelText} { + + if (numScreens > 1) { pageIndicatorBasePoints[0].x = 240 - 1; pageIndicatorBasePoints[0].y = 6; pageIndicatorBasePoints[1].x = 240 - 1; pageIndicatorBasePoints[1].y = 240 - 6; - + 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 = 228 / numScreens; uint16_t indicatorPos = indicatorSize * screenID; @@ -34,7 +31,6 @@ Label::Label(uint8_t screenID, uint8_t numScreens, lv_obj_set_style_local_line_rounded(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, true); lv_line_set_points(pageIndicator, pageIndicatorPoints, 2); } - } Label::~Label() { |