summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/Alarm.cpp
diff options
context:
space:
mode:
authorMichele Bini <michele.bini@gmail.com>2022-05-12 04:18:02 (GMT)
committerMichele Bini <michele.bini@gmail.com>2022-05-12 04:18:02 (GMT)
commit6e9eafeba44fd0e698cf288704a5eb2fc6bd76aa (patch)
tree7d98fb3cbcaa05cf02585481c8e822005093c41f /src/displayapp/screens/Alarm.cpp
parent6c3268c24be4555b68d4fd4e4bf488d5fce1369c (diff)
Use nullptr when aligning relative to parent
Diffstat (limited to 'src/displayapp/screens/Alarm.cpp')
-rw-r--r--src/displayapp/screens/Alarm.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/displayapp/screens/Alarm.cpp b/src/displayapp/screens/Alarm.cpp
index 879e50d..b8c16f3 100644
--- a/src/displayapp/screens/Alarm.cpp
+++ b/src/displayapp/screens/Alarm.cpp
@@ -59,7 +59,7 @@ Alarm::Alarm(DisplayApp* app,
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, "+");
@@ -67,7 +67,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, "-");
@@ -75,7 +75,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, "+");
@@ -83,7 +83,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, "-");
@@ -101,7 +101,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();
@@ -109,7 +109,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");
@@ -288,7 +288,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);