From 06b21752261227945066f711981b8dbfbfd6025b Mon Sep 17 00:00:00 2001
From: Piotr Tanski <piotr.tanski@mudita.com>
Date: Thu, 3 Dec 2020 08:56:40 +0100
Subject: [PATCH] [EGD-4561] Fixed displaying the special characters in a note
 title. (#1124)

---
 changelog.md                                  |  3 +-
 .../application-notes/widgets/NotesItem.cpp   | 32 ++++++++-----------
 .../application-notes/widgets/NotesItem.hpp   |  4 +--
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/changelog.md b/changelog.md
index 7124628f2b6337b29ebc7f73b257dfce4b2e342b..b4357bf82fad0bb828b19131400c1bc00675f84d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -17,7 +17,8 @@
 
 ### Fixed
 
-* `[meditation]` Fixed default counter settings 
+* `[meditation]` Fixed default counter settings
+* `[notes]` Fixed displaying the special characters in a note title.
 
 ### Other
 
diff --git a/module-apps/application-notes/widgets/NotesItem.cpp b/module-apps/application-notes/widgets/NotesItem.cpp
index 5bde5fb64cebd2aceb58fa6451dbe52433b5fcdf..02d5cb8327c9e125b8fd23543e50ba404f5acd71 100644
--- a/module-apps/application-notes/widgets/NotesItem.cpp
+++ b/module-apps/application-notes/widgets/NotesItem.cpp
@@ -25,33 +25,29 @@ namespace gui
         setPenFocusWidth(style::window::default_border_focus_w);
         setPenWidth(style::window::default_border_no_focus_w);
 
-        title = createEmptyLabel(this);
-        title->setFont(style::window::font::bigbold);
-        title->setAlignment(gui::Alignment{gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Top});
-
-        date = createEmptyLabel(this);
+        date = new gui::Label(this, 0, 0, 0, 0);
+        date->setEdges(RectangleEdge::None);
         date->setFont(style::window::font::medium);
         date->setAlignment(gui::Alignment{gui::Alignment::Horizontal::Right, gui::Alignment::Vertical::Top});
 
-        snippet = new gui::TextFixedSize(this, 0, 0, 0, 0);
-        snippet->setFont(style::window::font::small);
-        snippet->setAlignment(gui::Alignment{gui::Alignment::Horizontal::Left});
-        snippet->setEdges(gui::RectangleEdge::None);
-        snippet->setPenFocusWidth(::style::window::default_border_focus_w);
-        snippet->setPenWidth(::style::window::default_border_rect_no_focus);
-        snippet->setEditMode(gui::EditMode::BROWSE);
-        snippet->setUnderline(false);
+        title   = createTextField(this, style::window::font::bigbold);
+        snippet = createTextField(this, style::window::font::small);
 
         setSnippet(note->snippet);
         setDateText(note->date);
     }
 
-    gui::Label *NotesItem::createEmptyLabel(Item *parent)
+    gui::TextFixedSize *NotesItem::createTextField(Item *parent, const UTF8 &fontName)
     {
-        auto label = new gui::Label(parent, 0, 0, 0, 0);
-        label->setPenFocusWidth(0);
-        label->setPenWidth(0);
-        return label;
+        auto item = new gui::TextFixedSize(parent, 0, 0, 0, 0);
+        item->setFont(fontName);
+        item->setEdges(gui::RectangleEdge::None);
+        item->setAlignment(gui::Alignment{gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Top});
+        item->setPenFocusWidth(::style::window::default_border_focus_w);
+        item->setPenWidth(::style::window::default_border_rect_no_focus);
+        item->setEditMode(gui::EditMode::BROWSE);
+        item->setUnderline(false);
+        return item;
     }
 
     void NotesItem::setSnippet(const UTF8 &noteText)
diff --git a/module-apps/application-notes/widgets/NotesItem.hpp b/module-apps/application-notes/widgets/NotesItem.hpp
index 3d4586e64a46f5bd428c16cb65ba5092f20d8024..1078eb9122ff7da5884d1302f4aec364b81eb49c 100644
--- a/module-apps/application-notes/widgets/NotesItem.hpp
+++ b/module-apps/application-notes/widgets/NotesItem.hpp
@@ -19,7 +19,7 @@ namespace gui
         bool onDimensionChanged(const BoundingBox &oldDim, const BoundingBox &newDim) override;
 
       private:
-        static gui::Label *createEmptyLabel(Item *parent);
+        static gui::TextFixedSize *createTextField(Item *parent, const UTF8 &fontName);
 
         void buildInterface();
         void setSnippet(const UTF8 &noteText);
@@ -27,7 +27,7 @@ namespace gui
 
         std::shared_ptr<NotesRecord> note;
         gui::Label *date            = nullptr;
-        gui::Label *title           = nullptr;
+        gui::TextFixedSize *title   = nullptr;
         gui::TextFixedSize *snippet = nullptr;
     };
 } // namespace gui