From e7773df205b99b3c6596dddae7d206dee17c3d98 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 5 Oct 2019 19:35:52 +0200 Subject: [PATCH] Cosmetics --- radio/src/thirdparty/libopenui/src/numberedit.cpp | 5 +++-- radio/src/thirdparty/libopenui/src/textedit.cpp | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/numberedit.cpp b/radio/src/thirdparty/libopenui/src/numberedit.cpp index 8435a95d5..33b6e4fa9 100644 --- a/radio/src/thirdparty/libopenui/src/numberedit.cpp +++ b/radio/src/thirdparty/libopenui/src/numberedit.cpp @@ -32,17 +32,18 @@ void NumberEdit::paint(BitmapBuffer * dc) { FormField::paint(dc); + auto value = getValue(); + LcdFlags textColor; if (editMode) textColor = FOCUS_COLOR; else if (hasFocus()) textColor = FOCUS_BGCOLOR; - else if (enabled) + else if (enabled && (value != 0 || zeroText.empty())) textColor = DEFAULT_COLOR; else textColor = DISABLE_COLOR; - int32_t value = getValue(); if (displayFunction) displayFunction(dc, textColor, value); else if (value == 0 && !zeroText.empty()) diff --git a/radio/src/thirdparty/libopenui/src/textedit.cpp b/radio/src/thirdparty/libopenui/src/textedit.cpp index 65b95834f..e808dcc55 100644 --- a/radio/src/thirdparty/libopenui/src/textedit.cpp +++ b/radio/src/thirdparty/libopenui/src/textedit.cpp @@ -44,6 +44,9 @@ void TextEdit::paint(BitmapBuffer * dc) const char * displayedValue = value; LcdFlags textColor; if (hasFocus()) { + if (strlen(value) == 0) { + displayedValue = "---"; + } textColor = FOCUS_BGCOLOR; } else {