From a56e8dbe8e95ca9bea2eae7a5039ffcd876f3331 Mon Sep 17 00:00:00 2001 From: Lefucjusz Date: Wed, 1 Feb 2023 13:18:08 +0100 Subject: [PATCH] [MOS-361] Fix improper fonts in navbar Fix of the issue that navbar fonts for the left and right function buttons were bold, what was inconsistent with the design. --- module-gui/gui/widgets/NavBar.cpp | 7 +++---- pure_changelog.md | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module-gui/gui/widgets/NavBar.cpp b/module-gui/gui/widgets/NavBar.cpp index 664b7e0a82ffb23c962442fbd90330988322cab8..bf9b88b8831cc3fd78d77e08b3f94ed4608ad31f 100644 --- a/module-gui/gui/widgets/NavBar.cpp +++ b/module-gui/gui/widgets/NavBar.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 "NavBar.hpp" @@ -6,7 +6,6 @@ #include "Margins.hpp" #include "utf8/UTF8.hpp" #include -#include namespace gui::nav_bar { @@ -43,7 +42,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::window::font::smallbold); + left->setFont(style::window::font::small); left->setTextEllipsisType(TextEllipsis::Right); left->setVisible(true); left->setEdges(RectangleEdge::None); @@ -62,7 +61,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::window::font::smallbold); + right->setFont(style::window::font::small); right->setTextEllipsisType(TextEllipsis::Right); right->setVisible(true); right->setEdges(RectangleEdge::None); diff --git a/pure_changelog.md b/pure_changelog.md index 4e5cb9d709a65668db25c436d2cc8fec1c02a1aa..16bed15fa08e55742f19e8d49dc457f85cde87e0 100644 --- a/pure_changelog.md +++ b/pure_changelog.md @@ -50,6 +50,7 @@ * Fixed incorrect signal strength displayed in Center * Fixed inability to enter text in search field after clicking right arrow * Fixed displaying wrong screen after contact removal +* Fixed improper font weight used in navbar ### Added