From 3b317848720ff83cd435d47a550249fe9d10deaf Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 20 Jun 2021 09:33:27 +0200
Subject: [PATCH] Fixed value widget colors

---
 radio/src/gui/colorlcd/widgets/value.cpp | 34 +++++++++++++-----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/radio/src/gui/colorlcd/widgets/value.cpp b/radio/src/gui/colorlcd/widgets/value.cpp
index 22fd4d3b7..f6515f731 100644
--- a/radio/src/gui/colorlcd/widgets/value.cpp
+++ b/radio/src/gui/colorlcd/widgets/value.cpp
@@ -26,10 +26,11 @@ const coord_t NUMBERS_PADDING = 4;
 class ValueWidget: public Widget
 {
   public:
-    ValueWidget(const WidgetFactory * factory, FormGroup * parent, const rect_t & rect, Widget::PersistentData * persistentData):
-      Widget(factory, parent, rect, persistentData)
-    {
-    }
+   ValueWidget(const WidgetFactory* factory, FormGroup* parent,
+               const rect_t& rect, Widget::PersistentData* persistentData) :
+       Widget(factory, parent, rect, persistentData)
+   {
+   }
 
     void refresh(BitmapBuffer * dc) override
     {
@@ -37,11 +38,12 @@ class ValueWidget: public Widget
       mixsrc_t field = persistentData->options[0].value.unsignedValue;
 
       // get color from options[1]
-      lcdSetColor(persistentData->options[1].value.unsignedValue);
+      LcdFlags color = COLOR2FLAGS(persistentData->options[1].value.unsignedValue);
 
       coord_t xValue, yValue, xLabel, yLabel;
       LcdFlags attrValue, attrLabel = 0;
 
+      bool twolines = false;
       if (width() < 120 && height() < 50) {
         xValue = 0;
         yValue = 14;
@@ -64,7 +66,8 @@ class ValueWidget: public Widget
         yLabel = 2;
         if (field >= MIXSRC_FIRST_TELEM) {
           if (isGPSSensor(1 + (field - MIXSRC_FIRST_TELEM) / 3)) {
-            attrValue = LEFT | FONT(L) | EXPANDED;
+            attrValue = LEFT | FONT(L);// | EXPANDED; // TODO
+            twolines = true;
           }
           else {
             attrValue = LEFT | FONT(XL);
@@ -72,7 +75,8 @@ class ValueWidget: public Widget
         }
 #if defined(INTERNAL_GPS)
         else if (field == MIXSRC_TX_GPS) {
-          attrValue = LEFT | FONT(L) | EXPANDED;
+          attrValue = LEFT | FONT(L);// | EXPANDED; // TODO
+          twolines = true;
         }
 #endif
         else {
@@ -87,28 +91,28 @@ class ValueWidget: public Widget
         }
         drawSource(dc, NUMBERS_PADDING, 2, field, CUSTOM_COLOR);
         drawSource(dc, NUMBERS_PADDING + 1, 3, field, BLACK);
-        drawTimer(dc, xValue, yValue, abs(timerState.val), attrValue | FONT(XL) | CUSTOM_COLOR);
+        drawTimer(dc, xValue, yValue, abs(timerState.val), attrValue | FONT(XL) | color);
       }
 
       if (field == MIXSRC_TX_TIME) {
         drawTimer(dc, xValue, yValue, getValue(MIXSRC_TX_TIME),
-                  attrValue | FONT(XL) | CUSTOM_COLOR);
+                  attrValue | FONT(XL) | color);
       }
       
       if (field >= MIXSRC_FIRST_TELEM) {
-        TelemetryItem & telemetryItem = telemetryItems[(field - MIXSRC_FIRST_TELEM) / 3]; // TODO macro to convert a source to a telemetry index
+        TelemetryItem & telemetryItem = telemetryItems[(field - MIXSRC_FIRST_TELEM) / 3];
         if (!telemetryItem.isAvailable() || telemetryItem.isOld()) {
-          lcdSetColor(lcdColorTable[TEXT_DISABLE_COLOR_INDEX]);
+          color = TEXT_DISABLE_COLOR;
         }
       }
 
       if (persistentData->options[2].value.boolValue) {
-        drawSource(dc,xLabel + 1, yLabel + 1, field, attrLabel | BLACK);
-        drawSourceValue(dc, xValue + 1, yValue + 1, field, attrValue | BLACK);
+        drawSource(dc,xLabel + 1, yLabel + 1, field, attrLabel | COLOR2FLAGS(BLACK));
+        drawSourceValue(dc, xValue + 1, yValue + 1, field, attrValue | COLOR2FLAGS(BLACK));
       }
 
-      drawSource(dc, xLabel, yLabel, field, attrLabel | CUSTOM_COLOR);
-      drawSourceValue(dc, xValue, yValue, field, attrValue | CUSTOM_COLOR);
+      drawSource(dc, xLabel, yLabel, field, attrLabel | color);
+      drawSourceValue(dc, xValue, yValue, field, attrValue | color);
     }
 
     void checkEvents() override