~aleteoryx/muditaos

055a1ca4a0c64b8394a96804b55ed9e63b92e12b — Bartosz 3 years ago b50eea9
[MOS-000] Rebase fixes

Rebase fixes
1 files changed, 3 insertions(+), 4 deletions(-)

M module-apps/apps-common/widgets/ButtonTriState.cpp
M module-apps/apps-common/widgets/ButtonTriState.cpp => module-apps/apps-common/widgets/ButtonTriState.cpp +3 -4
@@ 37,9 37,7 @@ namespace gui
        };

        currentState = requestedState;
        // placed here instead of a narrower scope because magic_enum can't retrieve the enum element's name inside a
        // switch()
        std::string_view stateName = magic_enum::enum_name(currentState);

        switch (currentState) {
        case State::On:
            setRectangleStyle();


@@ 52,7 50,8 @@ namespace gui
            setText(transitingText);
            break;
        default:
            LOG_ERROR("button state '%s' not implemented - defaulting to OFF", stateName.data());
            LOG_ERROR("button state '%s' not implemented - defaulting to OFF",
                      magic_enum::enum_name(currentState).data());
            [[fallthrough]];
        case State::Off:
            setRectangleStyle();