6 files changed, 34 insertions(+), 26 deletions(-)

M module-apps/apps-common/widgets/TimeSetFmtSpinner.cpp
M module-apps/apps-common/widgets/TimeSetFmtSpinner.hpp
M module-gui/gui/widgets/Item.cpp
M products/BellHybrid/apps/common/include/common/widgets/BellStatusClock.hpp
M products/BellHybrid/apps/common/src/widgets/BellStatusClock.cpp
M products/BellHybrid/apps/common/src/widgets/ListItems.cpp

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "TimeSetFmtSpinner.hpp"


@@ 11,18 11,18 @@
 namespace gui
 {
 
-    TimeSetFmtSpinner::TimeSetFmtSpinner(Item *parent, utils::time::Locale::TimeFormat timeFormat) : HBox{parent}
+    TimeSetFmtSpinner::TimeSetFmtSpinner(Item *parent) : HBox{parent}
     {
         using namespace utils;
 
         setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
         setEdges(RectangleEdge::None);
 
-        timeSetSpinner = new TimeSetSpinner(this, 0, 0, 0, 0);
+        timeSetSpinner = new TimeSetSpinner(nullptr);
         timeSetSpinner->setFont(focusFontName, noFocusFontName);
         timeSetSpinner->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
 
-        auto textRange = StringSpinner::range{time::Locale::getAM(), time::Locale::getPM()};
+        auto textRange = {time::Locale::getAM(), time::Locale::getPM()};
         fmt            = new StringSpinner(textRange, Boundaries::Continuous);
         updateFmtFont(noFocusFontName);
         fmt->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));


@@ 30,9 30,15 @@ namespace gui
         fmt->setEdges(RectangleEdge::None);
         fmt->setVisible(false);
         fmt->setPenFocusWidth(style::time_set_spinner::focus::size);
-        addWidget(fmt);
         fmt->setEdges(RectangleEdge::Bottom);
 
+        addWidget(timeSetSpinner);
+        addWidget(fmt);
+
+        setTimeFormat(timeFormat, false);
+
+        resizeItems();
+
         focusChangedCallback = [&](Item &) {
             if (focus) {
                 setTimeFormat(this->timeFormat);


@@ 55,12 61,16 @@ namespace gui
             }
             return true;
         };
-
-        setTimeFormat(timeFormat);
     }
 
     auto TimeSetFmtSpinner::setTimeFormat(utils::time::Locale::TimeFormat newFormat) noexcept -> void
     {
+        setTimeFormat(newFormat, true);
+    }
+
+    auto TimeSetFmtSpinner::setTimeFormat(utils::time::Locale::TimeFormat newFormat, bool informContentChanged) noexcept
+        -> void
+    {
         using namespace utils;
 
         switch (newFormat) {


@@ 93,7 103,10 @@ namespace gui
         }
 
         timeFormat = newFormat;
-        fmt->handleContentChanged();
+
+        if (informContentChanged) {
+            fmt->handleContentChanged();
+        }
     }
 
     auto TimeSetFmtSpinner::setMinute(int value) noexcept -> void

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once


@@ 35,9 35,7 @@ namespace gui
             AM,
             PM
         };
-        explicit TimeSetFmtSpinner(
-            Item *parent                               = nullptr,
-            utils::time::Locale::TimeFormat timeFormat = utils::time::Locale::TimeFormat::FormatTime12H);
+        explicit TimeSetFmtSpinner(Item *parent = nullptr);
 
         /// Switches currently displayed time format
         auto setTimeFormat(utils::time::Locale::TimeFormat fmt) noexcept -> void;


@@ 69,6 67,8 @@ namespace gui
             Right
         };
 
+        auto setTimeFormat(utils::time::Locale::TimeFormat fmt, bool informContentChanged) noexcept -> void;
+
         std::map<std::string, Margins> fmtMarginsMap = {
             {style::window::font::verybiglight, {style::time_set_fmt_spinner::small_margin, 0, 0, 0}},
             {style::window::font::veryverybiglight, {style::time_set_fmt_spinner::small_margin, 0, 0, 0}},

@@ 180,8 180,7 @@ namespace gui
 
     void Item::informContentChanged()
     {
-        // check if item has been initialized to prevent looping
-        if (parent != nullptr && widgetArea != BoundingBox()) {
+        if (parent != nullptr) {
             contentChanged = true;
             parent->handleContentChanged();
         }


@@ 189,9 188,7 @@ namespace gui
 
     void Item::handleContentChanged()
     {
-        if (parent != nullptr) {
-            informContentChanged();
-        }
+        informContentChanged();
     }
 
     void Item::setSize(Length w, Length h)

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once


@@ 10,9 10,7 @@ namespace gui
     class BellStatusClock : public TimeSetFmtSpinner
     {
       public:
-        explicit BellStatusClock(
-            Item *parent                               = nullptr,
-            utils::time::Locale::TimeFormat timeFormat = utils::time::Locale::TimeFormat::FormatTime12H);
+        explicit BellStatusClock(Item *parent = nullptr);
     };
 
 } // namespace gui

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <common/widgets/BellStatusClock.hpp>


@@ 8,8 8,7 @@
 namespace gui
 {
 
-    BellStatusClock::BellStatusClock(Item *parent, utils::time::Locale::TimeFormat timeFormat)
-        : TimeSetFmtSpinner{parent, timeFormat}
+    BellStatusClock::BellStatusClock(Item *parent) : TimeSetFmtSpinner{parent}
     {
         setFont(bell_style::statusClockFont);
         setEditMode(EditMode::Browse);

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <common/data/StyleCommon.hpp>


@@ 48,7 48,8 @@ namespace gui
                                const std::string &topDescription)
         : BellSideListItemWithCallbacks(topDescription)
     {
-        spinner = new TimeSetFmtSpinner(body->getCenterBox(), timeFormat);
+        spinner = new TimeSetFmtSpinner(body->getCenterBox());
+        spinner->setTimeFormat(timeFormat);
         spinner->setMaximumSize(::style::bell_base_layout::w, ::style::bell_base_layout::h);
         spinner->setFont(focusFont, noFocusFont);
         spinner->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));