diff options
Diffstat (limited to 'src/displayapp/screens/Alarm.cpp')
| -rw-r--r-- | src/displayapp/screens/Alarm.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/displayapp/screens/Alarm.cpp b/src/displayapp/screens/Alarm.cpp index 9edc19a..5a64b3b 100644 --- a/src/displayapp/screens/Alarm.cpp +++ b/src/displayapp/screens/Alarm.cpp @@ -46,13 +46,13 @@ Alarm::Alarm(DisplayApp* app, alarmMinutes = alarmController.Minutes(); lv_label_set_text_fmt(time, "%02hhu:%02hhu", alarmHours, alarmMinutes); - lv_obj_align(time, lv_scr_act(), LV_ALIGN_CENTER, 0, -25); + lv_obj_align(time, nullptr, LV_ALIGN_CENTER, 0, -25); btnHoursUp = lv_btn_create(lv_scr_act(), nullptr); btnHoursUp->user_data = this; lv_obj_set_event_cb(btnHoursUp, btnEventHandler); lv_obj_set_size(btnHoursUp, 60, 40); - lv_obj_align(btnHoursUp, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, -85); + lv_obj_align(btnHoursUp, nullptr, LV_ALIGN_IN_LEFT_MID, 20, -85); txtHrUp = lv_label_create(btnHoursUp, nullptr); lv_label_set_text_static(txtHrUp, "+"); @@ -60,7 +60,7 @@ Alarm::Alarm(DisplayApp* app, btnHoursDown->user_data = this; lv_obj_set_event_cb(btnHoursDown, btnEventHandler); lv_obj_set_size(btnHoursDown, 60, 40); - lv_obj_align(btnHoursDown, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, 35); + lv_obj_align(btnHoursDown, nullptr, LV_ALIGN_IN_LEFT_MID, 20, 35); txtHrDown = lv_label_create(btnHoursDown, nullptr); lv_label_set_text_static(txtHrDown, "-"); @@ -68,7 +68,7 @@ Alarm::Alarm(DisplayApp* app, btnMinutesUp->user_data = this; lv_obj_set_event_cb(btnMinutesUp, btnEventHandler); lv_obj_set_size(btnMinutesUp, 60, 40); - lv_obj_align(btnMinutesUp, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -20, -85); + lv_obj_align(btnMinutesUp, nullptr, LV_ALIGN_IN_RIGHT_MID, -20, -85); txtMinUp = lv_label_create(btnMinutesUp, nullptr); lv_label_set_text_static(txtMinUp, "+"); @@ -76,7 +76,7 @@ Alarm::Alarm(DisplayApp* app, btnMinutesDown->user_data = this; lv_obj_set_event_cb(btnMinutesDown, btnEventHandler); lv_obj_set_size(btnMinutesDown, 60, 40); - lv_obj_align(btnMinutesDown, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -20, 35); + lv_obj_align(btnMinutesDown, nullptr, LV_ALIGN_IN_RIGHT_MID, -20, 35); txtMinDown = lv_label_create(btnMinutesDown, nullptr); lv_label_set_text_static(txtMinDown, "-"); @@ -84,7 +84,7 @@ Alarm::Alarm(DisplayApp* app, btnEnable->user_data = this; lv_obj_set_event_cb(btnEnable, btnEventHandler); lv_obj_set_size(btnEnable, 115, 50); - lv_obj_align(btnEnable, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 0, 0); + lv_obj_align(btnEnable, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0); txtEnable = lv_label_create(btnEnable, nullptr); SetEnableButtonState(); @@ -92,7 +92,7 @@ Alarm::Alarm(DisplayApp* app, btnRecur->user_data = this; lv_obj_set_event_cb(btnRecur, btnEventHandler); lv_obj_set_size(btnRecur, 115, 50); - lv_obj_align(btnRecur, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0); + lv_obj_align(btnRecur, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0); txtRecur = lv_label_create(btnRecur, nullptr); SetRecurButtonState(); @@ -100,7 +100,7 @@ Alarm::Alarm(DisplayApp* app, btnInfo->user_data = this; lv_obj_set_event_cb(btnInfo, btnEventHandler); lv_obj_set_size(btnInfo, 50, 40); - lv_obj_align(btnInfo, lv_scr_act(), LV_ALIGN_CENTER, 0, -85); + lv_obj_align(btnInfo, nullptr, LV_ALIGN_CENTER, 0, -85); txtInfo = lv_label_create(btnInfo, nullptr); lv_label_set_text_static(txtInfo, "i"); @@ -252,7 +252,7 @@ void Alarm::ShowInfo() { lv_obj_set_event_cb(btnMessage, btnEventHandler); lv_obj_set_height(btnMessage, 200); lv_obj_set_width(btnMessage, 150); - lv_obj_align(btnMessage, lv_scr_act(), LV_ALIGN_CENTER, 0, 0); + lv_obj_align(btnMessage, nullptr, LV_ALIGN_CENTER, 0, 0); txtMessage = lv_label_create(btnMessage, nullptr); lv_obj_set_style_local_bg_color(btnMessage, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_NAVY); |
