From 924627cd1db8c287ea9c9e5e9b13ea1993dccafb Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 30 May 2020 11:57:02 +0200
Subject: [PATCH] Merge with latest 2.3

---
 radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp | 4 ++--
 radio/src/thirdparty/libopenui/src/button.cpp       | 4 +++-
 radio/src/thirdparty/libopenui/src/form.cpp         | 2 +-
 radio/src/thirdparty/libopenui/src/static.cpp       | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
index 99ecc572d..e577be270 100755
--- a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
+++ b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
@@ -562,11 +562,11 @@ coord_t BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_
         c -= 1;
       c += CJK_FIRST_LETTER_INDEX;
       uint8_t width = drawChar(x, y, font, fontspecs, c, flags);
-      INCREMENT_POS(width + 1);
+      INCREMENT_POS(width + CHAR_SPACING);
     }
     else if (c >= 0x20) {
       uint8_t width = drawChar(x, y, font, fontspecs, getMappedChar(c), flags);
-      INCREMENT_POS(width + 1);
+      INCREMENT_POS(width + CHAR_SPACING);
     }
     else if (c == '\n') {
       pos = orig_pos;
diff --git a/radio/src/thirdparty/libopenui/src/button.cpp b/radio/src/thirdparty/libopenui/src/button.cpp
index ffb46b445..71e2f2f24 100644
--- a/radio/src/thirdparty/libopenui/src/button.cpp
+++ b/radio/src/thirdparty/libopenui/src/button.cpp
@@ -102,7 +102,9 @@ void TextButton::paint(BitmapBuffer * dc)
     }
   }
 
-  dc->drawText(rect.w / 2, (rect.h - getFontHeight(textFlags)) / 2, text.c_str(), CENTERED | textFlags | textColor);
+  TRACE("ICI text=%s rect.h=%d fontHeight=%d", text.c_str(), rect.h, getFontHeight(textFlags));
+
+  dc->drawText(rect.w / 2, 1 + (rect.h - getFontHeight(textFlags)) / 2, text.c_str(), CENTERED | textFlags | textColor);
 }
 
 void IconButton::paint(BitmapBuffer * dc)
diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/thirdparty/libopenui/src/form.cpp
index d6f3ed1ec..c13cc3713 100644
--- a/radio/src/thirdparty/libopenui/src/form.cpp
+++ b/radio/src/thirdparty/libopenui/src/form.cpp
@@ -110,7 +110,7 @@ void FormGroup::addField(FormField * field, bool front)
       link(last, field);
     last = field;
   }
-  if (windowFlags & FORM_FORWARD_FOCUS) {
+  if (previous && (windowFlags & FORM_FORWARD_FOCUS)) {
     last->setNextField(this);
     link(previous, first);
   }
diff --git a/radio/src/thirdparty/libopenui/src/static.cpp b/radio/src/thirdparty/libopenui/src/static.cpp
index 210031325..25766d162 100755
--- a/radio/src/thirdparty/libopenui/src/static.cpp
+++ b/radio/src/thirdparty/libopenui/src/static.cpp
@@ -25,7 +25,7 @@ void StaticText::paint(BitmapBuffer * dc)
   if (windowFlags & BUTTON_BACKGROUND)
     dc->drawSolidFilledRect(0, 0, rect.w, rect.h, DISABLE_COLOR);
   if (textFlags & CENTERED)
-    dc->drawText(rect.w / 2, (1 + rect.h - getFontHeight(textFlags)) / 2, text.c_str(), textFlags);
+    dc->drawText(rect.w / 2, 1 + (rect.h - getFontHeight(textFlags)) / 2, text.c_str(), textFlags);
   else if (textFlags & RIGHT)
     dc->drawText(rect.w, FIELD_PADDING_TOP, text.c_str(), textFlags);
   else