From c62208261e909038db5bee189983b15ef285cb16 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 14 Feb 2022 14:07:14 +0100
Subject: [PATCH] Allows for multi-byte pictograms in MenuToolbarButton

---
 radio/src/thirdparty/libopenui/src/menutoolbar.cpp | 8 ++++----
 radio/src/thirdparty/libopenui/src/menutoolbar.h   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/menutoolbar.cpp b/radio/src/thirdparty/libopenui/src/menutoolbar.cpp
index 1c5181c63..aff6fcb9e 100644
--- a/radio/src/thirdparty/libopenui/src/menutoolbar.cpp
+++ b/radio/src/thirdparty/libopenui/src/menutoolbar.cpp
@@ -28,10 +28,10 @@ void MenuToolbarButton::paint(BitmapBuffer * dc)
         MENUS_TOOLBAR_BUTTON_WIDTH - 2 * MENUS_TOOLBAR_BUTTON_PADDING,
         MENUS_TOOLBAR_BUTTON_WIDTH - 2 * MENUS_TOOLBAR_BUTTON_PADDING,
         COLOR_THEME_FOCUS);
-    dc->drawSizedText(rect.w / 2, (rect.h - getFontHeight(FONT(STD))) / 2 + 1,
-                      &picto, 1, CENTERED | COLOR_THEME_PRIMARY2);
+    dc->drawText(rect.w / 2, (rect.h - getFontHeight(FONT(STD))) / 2 + 1,
+                 picto, CENTERED | COLOR_THEME_PRIMARY2);
   } else {
-    dc->drawSizedText(rect.w / 2, (rect.h - getFontHeight(FONT(STD))) / 2 + 1,
-                      &picto, 1, CENTERED | COLOR_THEME_PRIMARY1);
+    dc->drawText(rect.w / 2, (rect.h - getFontHeight(FONT(STD))) / 2 + 1,
+                 picto, CENTERED | COLOR_THEME_PRIMARY1);
   }
 }
diff --git a/radio/src/thirdparty/libopenui/src/menutoolbar.h b/radio/src/thirdparty/libopenui/src/menutoolbar.h
index 37c6b8a01..dd858af3a 100644
--- a/radio/src/thirdparty/libopenui/src/menutoolbar.h
+++ b/radio/src/thirdparty/libopenui/src/menutoolbar.h
@@ -27,7 +27,7 @@ int getFirstAvailable(int min, int max, std::function<bool(int)>isValueAvailable
 
 class MenuToolbarButton: public Button {
   public:
-    MenuToolbarButton(FormGroup * window, const rect_t & rect, char picto):
+    MenuToolbarButton(FormGroup * window, const rect_t & rect, const char* picto):
 #if defined(HARDWARE_TOUCH)
       Button(window, rect, nullptr),
 #else
@@ -40,7 +40,7 @@ class MenuToolbarButton: public Button {
     void paint(BitmapBuffer * dc) override;
 
   protected:
-    char picto;
+    const char* picto;
 };
 
 template <class T>
@@ -112,7 +112,7 @@ class MenuToolbar: public FormGroup {
     coord_t y = 0;
     std::vector<MenuToolbarButton *> menuButtons;
 
-    void addButton(char picto, int16_t filtermin, int16_t filtermax)
+    void addButton(const char* picto, int16_t filtermin, int16_t filtermax)
     {
       int vmin = choice->vmin;
       int vmax = choice->vmax;