From 89829b9eac8233c270448e3e3544f3f57c7bbb16 Mon Sep 17 00:00:00 2001 From: Lukasz Mastalerz Date: Thu, 14 Dec 2023 12:35:25 +0100 Subject: [PATCH] [BH-1824] Removal of the minus sign in countdown time in Meditation Removed minus sign in countdown timer in Meditation --- .../data/MeditationStyle.hpp | 5 +++-- .../windows/MeditationCountdownWindow.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/data/MeditationStyle.hpp b/products/BellHybrid/apps/application-bell-meditation-timer/data/MeditationStyle.hpp index 96881a0d10cecda4d2236e8fffb07b6b61685e4e..26639756ece015312b3cc330f102cf0d719b45bd 100644 --- a/products/BellHybrid/apps/application-bell-meditation-timer/data/MeditationStyle.hpp +++ b/products/BellHybrid/apps/application-bell-meditation-timer/data/MeditationStyle.hpp @@ -51,8 +51,9 @@ namespace app::meditationStyle namespace timer { - constexpr inline auto marginTop = 23; - constexpr inline auto font = runningStyle::timer::font; + constexpr inline auto marginTop = 23; + constexpr inline auto marginLeft = 43; + constexpr inline auto font = runningStyle::timer::font; constexpr inline auto maxSizeX = runningStyle::timer::maxSizeX; constexpr inline auto maxSizeY = runningStyle::timer::maxSizeY; } // namespace timer diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp index 4ee6b0dd30366892f7cf29bbef9e6a706d630a75..fd377052b7e8177ca93a1cced4bbcaebebc71707 100644 --- a/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp +++ b/products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationCountdownWindow.cpp @@ -16,6 +16,7 @@ namespace constexpr auto meditationCountdownTimerName{"MeditationCountdownTimer"}; constexpr std::chrono::seconds meditationCountdownTimerPeriod{1}; constexpr auto meditationCountdownMode{app::ProgressCountdownMode::Increasing}; + constexpr auto leftBoxSize{1}; } // namespace namespace gui @@ -73,12 +74,12 @@ namespace gui 0, runningStyle::timer::maxSizeX, runningStyle::timer::maxSizeY, - true, - 1, + false, + leftBoxSize, TimeFixedWidget::RightBox::defaultSize); timer->setFontAndDimensions(countdownStyle::timer::font); timer->setMinimumSize(countdownStyle::timer::maxSizeX, countdownStyle::timer::maxSizeY); - timer->setMargins(gui::Margins(0, countdownStyle::timer::marginTop, 0, 0)); + timer->setMargins(gui::Margins(countdownStyle::timer::marginLeft, countdownStyle::timer::marginTop, 0, 0)); timer->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center)); mainVBox->resizeItems();