From ff7722755ecb56f37afb5ae4a0b2363a2615e5b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jo=C5=84ski?= Date: Wed, 30 Mar 2022 16:27:39 +0200 Subject: [PATCH] [MOS-361] Navbar fonts size fix Fix navbar fonts size regression --- module-gui/gui/widgets/NavBar.cpp | 6 +++--- module-gui/gui/widgets/Style.hpp | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/module-gui/gui/widgets/NavBar.cpp b/module-gui/gui/widgets/NavBar.cpp index 245133ad3c31c8da3fb2a72f2b8f9d3d6c3bdb80..664b7e0a82ffb23c962442fbd90330988322cab8 100644 --- a/module-gui/gui/widgets/NavBar.cpp +++ b/module-gui/gui/widgets/NavBar.cpp @@ -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); diff --git a/module-gui/gui/widgets/Style.hpp b/module-gui/gui/widgets/Style.hpp index ee1d382875c983a882644223d6fa6333a2ca2644..6f03dcc0da9371b71bd0f4d0120cd792106a9a69 100644 --- a/module-gui/gui/widgets/Style.hpp +++ b/module-gui/gui/widgets/Style.hpp @@ -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