From 01cc3aa99f1109b9cb7dffb92e55cbfc5b014210 Mon Sep 17 00:00:00 2001
From: 3djc <Th1sisfmyofmyo>
Date: Mon, 19 Apr 2021 11:47:50 +0200
Subject: [PATCH] Fix test widget

---
 radio/src/gui/colorlcd/widget_settings.cpp | 12 ++++++++++--
 radio/src/gui/colorlcd/widgets/text.cpp    |  3 ---
 radio/src/translations.cpp                 |  3 +++
 radio/src/translations.h                   |  1 +
 radio/src/translations/untranslated.h      | 10 ++++++++++
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/radio/src/gui/colorlcd/widget_settings.cpp b/radio/src/gui/colorlcd/widget_settings.cpp
index a82512ef0..39756062b 100644
--- a/radio/src/gui/colorlcd/widget_settings.cpp
+++ b/radio/src/gui/colorlcd/widget_settings.cpp
@@ -83,14 +83,22 @@ WidgetSettings::WidgetSettings(Window * parent, Widget * widget) :
         break;
 
       case ZoneOption::String:
+        new ModelTextEdit(form, grid.getFieldSlot(),  widget->getOptionValue(optIdx)->stringValue, sizeof( widget->getOptionValue(optIdx)->stringValue));
         break;
 
       case ZoneOption::File:
         break;
 
-      case ZoneOption::TextSize:
+      case ZoneOption::TextSize: {
+        new Choice(form, grid.getFieldSlot(), STR_FONT_SIZES, 0, FONTS_COUNT - 1,
+                                   [=]() -> int {        // getValue
+                                       return (int) widget->getOptionValue(optIdx)->unsignedValue;
+                                   },
+                                   [=](int newValue) {   // setValue
+                                       widget->getOptionValue(optIdx)->unsignedValue = (uint32_t) newValue;
+                                   });
         break;
-
+      }
       case ZoneOption::Timer: // Unsigned
       {
         auto tmChoice = new Choice(form, grid.getFieldSlot(), 0, TIMERS - 1,
diff --git a/radio/src/gui/colorlcd/widgets/text.cpp b/radio/src/gui/colorlcd/widgets/text.cpp
index 9605d6035..701dfef84 100644
--- a/radio/src/gui/colorlcd/widgets/text.cpp
+++ b/radio/src/gui/colorlcd/widgets/text.cpp
@@ -33,9 +33,6 @@ class TextWidget: public Widget
 
     void paint(BitmapBuffer * dc) override
     {
-      // clear the background
-      dc->clear(DEFAULT_BGCOLOR);
-
       // get font color from options[1]
       lcdSetColor(persistentData->options[1].value.unsignedValue);
 
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 4d4075bb5..663e1c5bb 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -22,6 +22,9 @@
 
 #define ISTR(x) const char STR_##x[] = LEN_##x TR_##x
 
+#if defined(COLORLCD)
+ISTR(FONT_SIZES);
+#endif
 ISTR(OFFON);
 ISTR(MMMINV);
 ISTR(VBEEPMODE);
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 755c6bca4..fa6f69e5c 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -152,6 +152,7 @@ extern const char STR_USBMODES[];
 extern const char STR_JACK_MODES[];
 extern const char STR_VFAILSAFE[];
 
+extern const char STR_FONT_SIZES[];
 extern const char STR_VTRAINERMODES[];
 extern const char STR_EXTERNAL_MODULE_PROTOCOLS[];
 extern const char STR_INTERNAL_MODULE_PROTOCOLS[];
diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h
index bbd753897..b98d5b70e 100644
--- a/radio/src/translations/untranslated.h
+++ b/radio/src/translations/untranslated.h
@@ -100,6 +100,16 @@
 #define TR_MODULE_R9M_LITE "R9MLite\0    "
 #endif
 
+#if defined(COLORLCD)
+#if defined(BOLD)
+#define LEN_FONT_SIZES                "\003"
+#define TR_FONT_SIZES                 "STD"
+#else
+#define LEN_FONT_SIZES                "\004"
+#define TR_FONT_SIZES                 "STD\0""BOLD""XXS\0""XS\0 ""L\0  ""XL\0 ""XXL\0"
+#endif
+#endif
+
 #define LEN_EXTERNAL_MODULE_PROTOCOLS  "\014"
 #define TR_EXTERNAL_MODULE_PROTOCOLS   "OFF\0        ""PPM\0        ""XJT\0        ""ISRM\0       ""DSM2\0       ""CRSF\0       ""MULTI\0      ""R9M\0        ""R9M ACCESS\0 " TR_MODULE_R9M_LITE "R9ML ACCESS\0""GHST\0       ""R9MLP ACCESS""SBUS\0       ""XJT Lite\0   ""AFHDS3\0  "