From 9bf7563a024944d026cb5f00796f6071256785b5 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 19 Oct 2019 19:26:14 +0200
Subject: [PATCH] lcdNextPos not needed anymore

---
 radio/src/gui/colorlcd/radio_version.cpp | 27 +++++++++++-------------
 radio/src/thirdparty/libopenui           |  2 +-
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/radio/src/gui/colorlcd/radio_version.cpp b/radio/src/gui/colorlcd/radio_version.cpp
index 642e2a322..2efe4b9ba 100644
--- a/radio/src/gui/colorlcd/radio_version.cpp
+++ b/radio/src/gui/colorlcd/radio_version.cpp
@@ -29,10 +29,10 @@ class OptionsText : public StaticText {
       StaticText(parent, rect)
     {
       coord_t optionWidth = 0;
-      for (uint8_t i=0; options[i]; i++) {
+      for (uint8_t i = 0; options[i]; i++) {
         const char * option = options[i];
-        optionWidth+= getTextWidth(option);
-        if(optionWidth + 5 > width()) {
+        optionWidth += getTextWidth(option);
+        if (optionWidth + 5 > width()) {
           setHeight(getHeight() + 20);
           optionWidth = 0;
         }
@@ -42,23 +42,20 @@ class OptionsText : public StaticText {
     void paint(BitmapBuffer * dc) override
     {
       coord_t y = 0;
-      lcdNextPos = 0;
-      for (uint8_t i=0; options[i]; i++) {
+      coord_t x = 0;
+      for (uint8_t i = 0; options[i]; i++) {
         const char * option = options[i];
         coord_t optionWidth = getTextWidth(option);
-
-        if (lcdNextPos + 5 + optionWidth > width()) {
-          dc->drawText(lcdNextPos, y, ",");
-          lcdNextPos = 0;
+        if (x + 5 + optionWidth > width()) {
+          dc->drawText(x, y, ",");
+          x = 0;
           y += FH;
-         }
-        if (i > 0 && lcdNextPos != 0)
-          dc->drawText(lcdNextPos, y, ", ");
-        dc->drawText(lcdNextPos, y, option);
+        }
+        if (i > 0 && x != 0)
+          x = dc->drawText(x, y, ", ");
+        x = dc->drawText(x, y, option);
       }
     }
-
-  protected:
 };
 
 RadioVersionPage::RadioVersionPage():
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 3951b5574..5b4ee51fe 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 3951b557499ce1e1878f07e25a0708b94266f092
+Subproject commit 5b4ee51fe34af1ac14db543466ea1b1d4104647f