scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Move linePoints to a member variable

Browse source
This commit is contained in:
Riku Isokoski 2022-05-18 23:16:00 +03:00 committed by JF
parent 17cedd6629
commit 41c461d1f6
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/displayapp/widgets/Counter.cpp
View file

@ -89,17 +89,18 @@ void Counter::Create() {
lv_label_set_text_static(downLabel, "-"); lv_label_set_text_static(downLabel, "-");
lv_obj_align(downLabel, nullptr, LV_ALIGN_CENTER, 0, 0); lv_obj_align(downLabel, nullptr, LV_ALIGN_CENTER, 0, 0);
static lv_point_t line_points[] = {{0, 0}, {width, 0}}; linePoints[0] = {0, 0};
linePoints[1] = {width, 0};
lv_obj_t* upperLine = lv_line_create(counterContainer, nullptr); lv_obj_t* upperLine = lv_line_create(counterContainer, nullptr);
lv_line_set_points(upperLine, line_points, 2); lv_line_set_points(upperLine, linePoints, 2);
lv_obj_set_style_local_line_width(upperLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 1); lv_obj_set_style_local_line_width(upperLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 1);
lv_obj_set_style_local_line_color(upperLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE); lv_obj_set_style_local_line_color(upperLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
lv_obj_set_style_local_line_opa(upperLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20); lv_obj_set_style_local_line_opa(upperLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20);
lv_obj_align(upperLine, upBtn, LV_ALIGN_OUT_BOTTOM_MID, 0, 0); lv_obj_align(upperLine, upBtn, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
lv_obj_t* lowerLine = lv_line_create(counterContainer, nullptr); lv_obj_t* lowerLine = lv_line_create(counterContainer, nullptr);
lv_line_set_points(lowerLine, line_points, 2); lv_line_set_points(lowerLine, linePoints, 2);
lv_obj_set_style_local_line_width(lowerLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 1); lv_obj_set_style_local_line_width(lowerLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 1);
lv_obj_set_style_local_line_color(lowerLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE); lv_obj_set_style_local_line_color(lowerLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
lv_obj_set_style_local_line_opa(lowerLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20); lv_obj_set_style_local_line_opa(lowerLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20);

1
src/displayapp/widgets/Counter.h
View file

@ -30,6 +30,7 @@ namespace Pinetime {
lv_obj_t* upBtn; lv_obj_t* upBtn;
lv_obj_t* downBtn; lv_obj_t* downBtn;
lv_obj_t* number; lv_obj_t* number;
lv_point_t linePoints[2];
int value = 0; int value = 0;
int min; int min;
int max; int max;