From b93c2e776cd731e83f233b8f5fb5d772d9357be3 Mon Sep 17 00:00:00 2001 From: Titus Kendzorra Date: Sat, 18 Jan 2025 15:30:32 +0100 Subject: [PATCH 1/6] centered timer button by connecting text object to button object --- src/displayapp/screens/Timer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp index f6d5e73bdc..431d3d8108 100644 --- a/src/displayapp/screens/Timer.cpp +++ b/src/displayapp/screens/Timer.cpp @@ -59,8 +59,8 @@ Timer::Timer(Controllers::Timer& timerController) : timer {timerController} { lv_obj_set_event_cb(btnPlayPause, btnEventHandler); lv_obj_set_size(btnPlayPause, LV_HOR_RES, 50); - txtPlayPause = lv_label_create(lv_scr_act(), nullptr); - lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); + txtPlayPause = lv_label_create(btnPlayPause, nullptr); + //lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); if (timer.IsRunning()) { SetTimerRunning(); From 6f9caa40b5f36cd9c72bd2e17d884823d5807318 Mon Sep 17 00:00:00 2001 From: Titus Kendzorra Date: Sat, 18 Jan 2025 15:30:32 +0100 Subject: [PATCH 2/6] centered timer button by connecting text object to button object --- src/displayapp/screens/Timer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp index f6d5e73bdc..431d3d8108 100644 --- a/src/displayapp/screens/Timer.cpp +++ b/src/displayapp/screens/Timer.cpp @@ -59,8 +59,8 @@ Timer::Timer(Controllers::Timer& timerController) : timer {timerController} { lv_obj_set_event_cb(btnPlayPause, btnEventHandler); lv_obj_set_size(btnPlayPause, LV_HOR_RES, 50); - txtPlayPause = lv_label_create(lv_scr_act(), nullptr); - lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); + txtPlayPause = lv_label_create(btnPlayPause, nullptr); + //lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); if (timer.IsRunning()) { SetTimerRunning(); From 4592e97b6f4cbd0deaf614be064117f30b1bbd7a Mon Sep 17 00:00:00 2001 From: Titus Kendzorra Date: Tue, 21 Jan 2025 14:35:38 +0100 Subject: [PATCH 3/6] added a space after a comment // --- src/displayapp/screens/Timer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp index 431d3d8108..cc942ab7a8 100644 --- a/src/displayapp/screens/Timer.cpp +++ b/src/displayapp/screens/Timer.cpp @@ -60,7 +60,7 @@ Timer::Timer(Controllers::Timer& timerController) : timer {timerController} { lv_obj_set_size(btnPlayPause, LV_HOR_RES, 50); txtPlayPause = lv_label_create(btnPlayPause, nullptr); - //lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); + // lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); if (timer.IsRunning()) { SetTimerRunning(); From 3b2b40b2009c3b641de2e71603eceaf1303b64ff Mon Sep 17 00:00:00 2001 From: Titus Kendzorra Date: Sat, 18 Jan 2025 15:30:32 +0100 Subject: [PATCH 4/6] centered timer button by connecting text object to button object --- src/displayapp/screens/Timer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp index f6d5e73bdc..431d3d8108 100644 --- a/src/displayapp/screens/Timer.cpp +++ b/src/displayapp/screens/Timer.cpp @@ -59,8 +59,8 @@ Timer::Timer(Controllers::Timer& timerController) : timer {timerController} { lv_obj_set_event_cb(btnPlayPause, btnEventHandler); lv_obj_set_size(btnPlayPause, LV_HOR_RES, 50); - txtPlayPause = lv_label_create(lv_scr_act(), nullptr); - lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); + txtPlayPause = lv_label_create(btnPlayPause, nullptr); + //lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); if (timer.IsRunning()) { SetTimerRunning(); From d033f19e7fb39d2014d112175e1dcdf1bc0604ff Mon Sep 17 00:00:00 2001 From: Titus Kendzorra Date: Tue, 21 Jan 2025 14:35:38 +0100 Subject: [PATCH 5/6] added a space after a comment // --- src/displayapp/screens/Timer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp index 431d3d8108..cc942ab7a8 100644 --- a/src/displayapp/screens/Timer.cpp +++ b/src/displayapp/screens/Timer.cpp @@ -60,7 +60,7 @@ Timer::Timer(Controllers::Timer& timerController) : timer {timerController} { lv_obj_set_size(btnPlayPause, LV_HOR_RES, 50); txtPlayPause = lv_label_create(btnPlayPause, nullptr); - //lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); + // lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); if (timer.IsRunning()) { SetTimerRunning(); From 3b8c07a46cec3f0d3207a6715ee4bd15637e3517 Mon Sep 17 00:00:00 2001 From: Titus Kendzorra Date: Wed, 14 May 2025 18:39:13 +0200 Subject: [PATCH 6/6] remove old realign line, add command for new label_create line --- src/displayapp/screens/Timer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp index cc942ab7a8..31cde73392 100644 --- a/src/displayapp/screens/Timer.cpp +++ b/src/displayapp/screens/Timer.cpp @@ -59,8 +59,8 @@ Timer::Timer(Controllers::Timer& timerController) : timer {timerController} { lv_obj_set_event_cb(btnPlayPause, btnEventHandler); lv_obj_set_size(btnPlayPause, LV_HOR_RES, 50); + // Create the label as a child of the button so it stays centered by default txtPlayPause = lv_label_create(btnPlayPause, nullptr); - // lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0); if (timer.IsRunning()) { SetTimerRunning();