2 files changed, 10 insertions(+), 6 deletions(-)

M module-apps/apps-common/widgets/AlarmSetSpinner.cpp
M module-apps/apps-common/widgets/TimeSetFmtSpinner.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

@@ 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);