From e971714e3145229f6246392c34729f3d8bfb53b2 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 14 Sep 2020 09:09:33 +0200 Subject: [PATCH] [FormField] Possible to avoid the border --- radio/src/thirdparty/libopenui/src/form.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/thirdparty/libopenui/src/form.cpp index a23713017..c6526a573 100644 --- a/radio/src/thirdparty/libopenui/src/form.cpp +++ b/radio/src/thirdparty/libopenui/src/form.cpp @@ -83,11 +83,13 @@ void FormField::paint(BitmapBuffer * dc) if (editMode) { dc->drawSolidFilledRect(0, 0, rect.w, rect.h, FOCUS_BGCOLOR); } - else if (hasFocus()) { - dc->drawSolidRect(0, 0, rect.w, rect.h, 2, FOCUS_BGCOLOR); - } - else if (!(windowFlags & FORM_BORDER_FOCUS_ONLY)) { - dc->drawSolidRect(0, 0, rect.w, rect.h, 1, DISABLE_COLOR); + else if (!(windowFlags & FORM_NO_BORDER)) { + if (hasFocus()) { + dc->drawSolidRect(0, 0, rect.w, rect.h, 2, FOCUS_BGCOLOR); + } + else if (!(windowFlags & FORM_BORDER_FOCUS_ONLY)) { + dc->drawSolidRect(0, 0, rect.w, rect.h, 1, DISABLE_COLOR); + } } }