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

Fix timer layout

Browse source
This commit is contained in:
Riku Isokoski 2022-04-09 12:55:01 +03:00
parent d7441d18be
commit 3bf6b1cb16
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/displayapp/screens/Timer.cpp
View file

@ -14,36 +14,32 @@ void Timer::CreateButtons() {
btnMinutesUp = lv_btn_create(lv_scr_act(), nullptr); btnMinutesUp = lv_btn_create(lv_scr_act(), nullptr);
btnMinutesUp->user_data = this; btnMinutesUp->user_data = this;
lv_obj_set_event_cb(btnMinutesUp, btnEventHandler); lv_obj_set_event_cb(btnMinutesUp, btnEventHandler);
lv_obj_align(btnMinutesUp, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, -80); lv_obj_set_size(btnMinutesUp, 60, 40);
lv_obj_set_height(btnMinutesUp, 40); lv_obj_align(btnMinutesUp, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, -85);
lv_obj_set_width(btnMinutesUp, 60);
txtMUp = lv_label_create(btnMinutesUp, nullptr); txtMUp = lv_label_create(btnMinutesUp, nullptr);
lv_label_set_text_static(txtMUp, "+"); lv_label_set_text_static(txtMUp, "+");
btnMinutesDown = lv_btn_create(lv_scr_act(), nullptr); btnMinutesDown = lv_btn_create(lv_scr_act(), nullptr);
btnMinutesDown->user_data = this; btnMinutesDown->user_data = this;
lv_obj_set_event_cb(btnMinutesDown, btnEventHandler); lv_obj_set_event_cb(btnMinutesDown, btnEventHandler);
lv_obj_align(btnMinutesDown, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, +40); lv_obj_set_size(btnMinutesDown, 60, 40);
lv_obj_set_height(btnMinutesDown, 40); lv_obj_align(btnMinutesDown, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 20, 35);
lv_obj_set_width(btnMinutesDown, 60);
txtMDown = lv_label_create(btnMinutesDown, nullptr); txtMDown = lv_label_create(btnMinutesDown, nullptr);
lv_label_set_text_static(txtMDown, "-"); lv_label_set_text_static(txtMDown, "-");
btnSecondsUp = lv_btn_create(lv_scr_act(), nullptr); btnSecondsUp = lv_btn_create(lv_scr_act(), nullptr);
btnSecondsUp->user_data = this; btnSecondsUp->user_data = this;
lv_obj_set_event_cb(btnSecondsUp, btnEventHandler); lv_obj_set_event_cb(btnSecondsUp, btnEventHandler);
lv_obj_align(btnSecondsUp, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 10, -80); lv_obj_set_size(btnSecondsUp, 60, 40);
lv_obj_set_height(btnSecondsUp, 40); lv_obj_align(btnSecondsUp, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -20, -85);
lv_obj_set_width(btnSecondsUp, 60);
txtSUp = lv_label_create(btnSecondsUp, nullptr); txtSUp = lv_label_create(btnSecondsUp, nullptr);
lv_label_set_text_static(txtSUp, "+"); lv_label_set_text_static(txtSUp, "+");
btnSecondsDown = lv_btn_create(lv_scr_act(), nullptr); btnSecondsDown = lv_btn_create(lv_scr_act(), nullptr);
btnSecondsDown->user_data = this; btnSecondsDown->user_data = this;
lv_obj_set_event_cb(btnSecondsDown, btnEventHandler); lv_obj_set_event_cb(btnSecondsDown, btnEventHandler);
lv_obj_align(btnSecondsDown, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 10, +40); lv_obj_set_size(btnSecondsDown, 60, 40);
lv_obj_set_height(btnSecondsDown, 40); lv_obj_align(btnSecondsDown, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -20, 35);
lv_obj_set_width(btnSecondsDown, 60);
txtSDown = lv_label_create(btnSecondsDown, nullptr); txtSDown = lv_label_create(btnSecondsDown, nullptr);
lv_label_set_text_static(txtSDown, "-"); lv_label_set_text_static(txtSDown, "-");
} }
@ -63,14 +59,13 @@ Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
uint32_t seconds = timerController.GetTimeRemaining() / 1000; uint32_t seconds = timerController.GetTimeRemaining() / 1000;
lv_label_set_text_fmt(time, "%02lu:%02lu", seconds / 60, seconds % 60); lv_label_set_text_fmt(time, "%02lu:%02lu", seconds / 60, seconds % 60);
lv_obj_align(time, lv_scr_act(), LV_ALIGN_CENTER, 0, -25);
lv_obj_align(time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -20);
btnPlayPause = lv_btn_create(lv_scr_act(), nullptr); btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
btnPlayPause->user_data = this; btnPlayPause->user_data = this;
lv_obj_set_event_cb(btnPlayPause, btnEventHandler); lv_obj_set_event_cb(btnPlayPause, btnEventHandler);
lv_obj_align(btnPlayPause, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, -10); lv_obj_set_size(btnPlayPause, 120, 50);
lv_obj_set_height(btnPlayPause, 40); lv_obj_align(btnPlayPause, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
txtPlayPause = lv_label_create(btnPlayPause, nullptr); txtPlayPause = lv_label_create(btnPlayPause, nullptr);
if (timerController.IsRunning()) { if (timerController.IsRunning()) {
lv_label_set_text_static(txtPlayPause, Symbols::pause); lv_label_set_text_static(txtPlayPause, Symbols::pause);