diff options
| -rw-r--r-- | src/displayapp/screens/WatchFaceTerminal.cpp | 14 | ||||
| -rw-r--r-- | src/displayapp/screens/WatchFaceTerminal.h | 10 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp index 65368c5..e870370 100644 --- a/src/displayapp/screens/WatchFaceTerminal.cpp +++ b/src/displayapp/screens/WatchFaceTerminal.cpp @@ -32,30 +32,23 @@ WatchFaceTerminal::WatchFaceTerminal(DisplayApp* app, motionController {motionController} { batteryValue = lv_label_create(lv_scr_act(), nullptr); lv_label_set_recolor(batteryValue, true); - lv_obj_align(batteryValue, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -20); connectState = lv_label_create(lv_scr_act(), nullptr); lv_label_set_recolor(connectState, true); - lv_obj_align(connectState, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 40); notificationIcon = lv_label_create(lv_scr_act(), nullptr); - lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_LEFT_MID, 0, -100); label_date = lv_label_create(lv_scr_act(), nullptr); lv_label_set_recolor(label_date, true); - lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -40); label_prompt_1 = lv_label_create(lv_scr_act(), nullptr); - lv_obj_align(label_prompt_1, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -80); lv_label_set_text_static(label_prompt_1, "user@watch:~ $ now"); label_prompt_2 = lv_label_create(lv_scr_act(), nullptr); - lv_obj_align(label_prompt_2, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 60); lv_label_set_text_static(label_prompt_2, "user@watch:~ $"); label_time = lv_label_create(lv_scr_act(), nullptr); lv_label_set_recolor(label_time, true); - lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -60); backgroundLabel = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_click(backgroundLabel, true); @@ -66,14 +59,15 @@ WatchFaceTerminal::WatchFaceTerminal(DisplayApp* app, heartbeatValue = lv_label_create(lv_scr_act(), nullptr); lv_label_set_recolor(heartbeatValue, true); - lv_obj_align(heartbeatValue, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 20); stepValue = lv_label_create(lv_scr_act(), nullptr); lv_label_set_recolor(stepValue, true); - lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 0); + uint16_t y = -100; for (auto line : lines) { - lv_obj_set_style_local_text_font( line, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &neofont15mono); + lv_obj_align(line, nullptr, LV_ALIGN_IN_LEFT_MID, 0, y); + y += 20; + lv_obj_set_style_local_text_font(line, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &neofont15mono); } taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this); diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h index 46cdaaf..786e949 100644 --- a/src/displayapp/screens/WatchFaceTerminal.h +++ b/src/displayapp/screens/WatchFaceTerminal.h @@ -57,19 +57,19 @@ namespace Pinetime { union { struct { + lv_obj_t* notificationIcon; + lv_obj_t* label_prompt_1; lv_obj_t* label_time; lv_obj_t* label_date; - lv_obj_t* label_prompt_1; - lv_obj_t* label_prompt_2; lv_obj_t* batteryValue; - lv_obj_t* heartbeatValue; lv_obj_t* stepValue; + lv_obj_t* heartbeatValue; lv_obj_t* connectState; + lv_obj_t* label_prompt_2; }; - lv_obj_t *lines[8]; + lv_obj_t *lines[9]; // This should match exactly the number of labels in the struct above }; lv_obj_t* backgroundLabel; - lv_obj_t* notificationIcon; Controllers::DateTime& dateTimeController; Controllers::Battery& batteryController; |