From 43d610f4a7d8f8cd529382780e0b9c562989e72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Jo=C5=84ski?= <pawel.jonski@mudita.com>
Date: Fri, 19 Nov 2021 13:49:08 +0100
Subject: [PATCH] [BH-1203] Fix alarm timer 12h format and spacing

Fixes:
- spacing after alarm ringing
- 12h format mode after changing from 24h
---
 module-apps/apps-common/widgets/AlarmSetSpinner.cpp   | 7 +++++--
 module-apps/apps-common/widgets/TimeSetFmtSpinner.cpp | 9 +++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/module-apps/apps-common/widgets/AlarmSetSpinner.cpp b/module-apps/apps-common/widgets/AlarmSetSpinner.cpp
index 2c6d6bc8c25b44c7670daa1edd984ffb730aadb9..3a1f3f711962a48291a56161361ab48b05017f04 100644
--- a/module-apps/apps-common/widgets/AlarmSetSpinner.cpp
+++ b/module-apps/apps-common/widgets/AlarmSetSpinner.cpp
@@ -24,6 +24,7 @@ namespace gui
         alarmImg->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         alarmImg->setMargins(Margins(style::alarm_set_spinner::margin, 0, style::alarm_set_spinner::margin, 0));
         alarmImg->setMinimumSizeToFitImage();
+        alarmImg->activeItem = false;
 
         timeSpinner = new TimeSetFmtSpinner(this);
         timeSpinner->setFont(style::window::font::largelight);
@@ -92,7 +93,6 @@ namespace gui
     auto AlarmSetSpinner::setAlarmStatus(Status status) noexcept -> void
     {
         alarmStatus = status;
-        alarmImg->setMinimumSizeToFitImage();
 
         switch (alarmStatus) {
         case Status::ACTIVATED:
@@ -116,7 +116,10 @@ namespace gui
             break;
         }
 
-        resizeItems();
+        alarmImg->setMinimumSizeToFitImage();
+        alarmImg->setMaximumSize(alarmImg->widgetMinimumArea.w, alarmImg->widgetMinimumArea.h);
+
+        alarmImg->informContentChanged();
     }
 
     auto AlarmSetSpinner::setAlarmTimeVisible(bool value) noexcept -> void
diff --git a/module-apps/apps-common/widgets/TimeSetFmtSpinner.cpp b/module-apps/apps-common/widgets/TimeSetFmtSpinner.cpp
index bd3444a0224633b5d058782f444c3938114736f0..ddc4f374b2ce003c1437abde85f9d64ca4ba5282 100644
--- a/module-apps/apps-common/widgets/TimeSetFmtSpinner.cpp
+++ b/module-apps/apps-common/widgets/TimeSetFmtSpinner.cpp
@@ -100,7 +100,7 @@ namespace gui
         }
 
         timeFormat = newFormat;
-        handleContentChanged();
+        fmt->handleContentChanged();
     }
 
     auto TimeSetFmtSpinner::setMinute(int value) noexcept -> void
@@ -261,9 +261,10 @@ namespace gui
         fmt->setMinimumWidthToFitText();
         fmt->setMargins(getFmtMargins(noFocusFontName));
 
-        auto widthToSet = fmt->visible ? timeSetSpinner->widgetMinimumArea.w + fmt->widgetMinimumArea.w +
-                                             fmt->margins.getSumInAxis(Axis::X)
-                                       : timeSetSpinner->widgetMinimumArea.w;
+        auto widthToSet =
+            timeFormat == utils::time::Locale::TimeFormat::FormatTime12H
+                ? timeSetSpinner->widgetMinimumArea.w + fmt->widgetMinimumArea.w + fmt->margins.getSumInAxis(Axis::X)
+                : timeSetSpinner->widgetMinimumArea.w;
 
         setMinimumWidth(widthToSet);
         setMaximumWidth(widgetMinimumArea.w);