~aleteoryx/muditaos

ff7722755ecb56f37afb5ae4a0b2363a2615e5b7 — Paweł Joński 3 years ago 1e4c793
[MOS-361] Navbar fonts size fix

Fix navbar fonts size regression
2 files changed, 3 insertions(+), 10 deletions(-)

M module-gui/gui/widgets/NavBar.cpp
M module-gui/gui/widgets/Style.hpp
M module-gui/gui/widgets/NavBar.cpp => module-gui/gui/widgets/NavBar.cpp +3 -3
@@ 43,7 43,7 @@ namespace gui::nav_bar
        left->setAlignment(Alignment(Alignment::Horizontal::Left, gui::Alignment::Vertical::Bottom));
        left->setPadding({0, 0, 0, style::nav_bar::bottom_padding});
        left->setMinimumHeight(widgetArea.h);
        left->setFont(style::nav_bar::font::medium);
        left->setFont(style::window::font::smallbold);
        left->setTextEllipsisType(TextEllipsis::Right);
        left->setVisible(true);
        left->setEdges(RectangleEdge::None);


@@ 53,7 53,7 @@ namespace gui::nav_bar
        center->setPadding({0, 0, 0, style::nav_bar::bottom_padding});
        center->setMinimumHeight(widgetArea.h);
        center->setMaximumWidth(widgetArea.w);
        center->setFont(style::nav_bar::font::bold);
        center->setFont(style::window::font::smallbold);
        center->setTextEllipsisType(TextEllipsis::Right);
        center->setVisible(true);
        center->setEdges(RectangleEdge::None);


@@ 62,7 62,7 @@ namespace gui::nav_bar
        right->setAlignment(Alignment(Alignment::Horizontal::Right, gui::Alignment::Vertical::Bottom));
        right->setPadding({0, 0, 0, style::nav_bar::bottom_padding});
        right->setMinimumHeight(widgetArea.h);
        right->setFont(style::nav_bar::font::medium);
        right->setFont(style::window::font::smallbold);
        right->setTextEllipsisType(TextEllipsis::Right);
        right->setVisible(true);
        right->setEdges(RectangleEdge::None);

M module-gui/gui/widgets/Style.hpp => module-gui/gui/widgets/Style.hpp +0 -7
@@ 113,13 113,6 @@ namespace style
        inline constexpr auto bottom_padding = 16U;
        inline constexpr auto left_margin    = 30U;
        inline constexpr auto right_margin   = 30U;

        namespace font
        {
            inline constexpr auto bold   = "mediumbold";
            inline constexpr auto medium = "medium";
        }; // namespace font

    } // namespace nav_bar

    namespace settings