diff --git a/radio/src/gui/colorlcd/output_edit.cpp b/radio/src/gui/colorlcd/output_edit.cpp index 0d731117f..1a44e48eb 100644 --- a/radio/src/gui/colorlcd/output_edit.cpp +++ b/radio/src/gui/colorlcd/output_edit.cpp @@ -83,13 +83,19 @@ void OutputEditWindow::checkEvents() value = newValue; int chanVal = calcRESXto100(channelOutputs[channel]); - minText->setBackgroundColor(chanVal < chanZero - 1 ? COLOR_THEME_ACTIVE - : 0U); + minText->setBackgroudOpacity(chanVal < chanZero - 1 ? LV_OPA_COVER : LV_OPA_TRANSP); + minText->setFont(chanVal < chanZero - 1 ? FONT(BOLD) : FONT(STD)); minText->invalidate(); - maxText->setBackgroundColor(chanVal > chanZero + 1 ? COLOR_THEME_ACTIVE - : 0U); + lv_obj_set_style_text_font(minEdit->getLvObj(), getFont(chanVal < chanZero - 1 ? FONT(BOLD) : FONT(STD)), 0); + minEdit->invalidate(); + + maxText->setBackgroudOpacity(chanVal > chanZero + 1 ? LV_OPA_COVER : LV_OPA_TRANSP); + maxText->setFont(chanVal > chanZero + 1 ? FONT(BOLD) : FONT(STD)); maxText->invalidate(); + lv_obj_set_style_text_font(maxEdit->getLvObj(), getFont(chanVal > chanZero + 1 ? FONT(BOLD) : FONT(STD)), 0); + maxEdit->invalidate(); } + Window::checkEvents(); } @@ -137,13 +143,15 @@ void OutputEditWindow::buildBody(FormWindow* form) // Min line = form->newLine(&grid); minText = new StaticText(line, rect_t{}, TR_MIN, 0, COLOR_THEME_PRIMARY1); - new GVarNumberEdit(line, rect_t{}, -limit, 0, GET_SET_DEFAULT(output->min), + minEdit = new GVarNumberEdit(line, rect_t{}, -limit, 0, GET_SET_DEFAULT(output->min), PREC1, -LIMIT_STD_MAX); + minText->setBackgroundColor(COLOR_THEME_ACTIVE); // Max maxText = new StaticText(line, rect_t{}, TR_MAX, 0, COLOR_THEME_PRIMARY1); - new GVarNumberEdit(line, rect_t{}, 0, +limit, GET_SET_DEFAULT(output->max), + maxEdit = new GVarNumberEdit(line, rect_t{}, 0, +limit, GET_SET_DEFAULT(output->max), PREC1, +LIMIT_STD_MAX); + maxText->setBackgroundColor(COLOR_THEME_ACTIVE); // Direction line = form->newLine(&grid); diff --git a/radio/src/gui/colorlcd/output_edit.h b/radio/src/gui/colorlcd/output_edit.h index ab10ab08f..d95478ee7 100644 --- a/radio/src/gui/colorlcd/output_edit.h +++ b/radio/src/gui/colorlcd/output_edit.h @@ -23,6 +23,7 @@ #include "page.h" #include "form.h" +#include "gvar_numberedit.h" #include "static.h" class OutputEditStatusBar; @@ -37,7 +38,9 @@ class OutputEditWindow : public Page int value = 0; int chanZero = 0; StaticText *minText; + GVarNumberEdit* minEdit; StaticText *maxText; + GVarNumberEdit* maxEdit; OutputEditStatusBar *statusBar = nullptr; void checkEvents() override; diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 47441631c..45c22ed5f 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 47441631c874af06eda1f4749cb6fa1631fc67ac +Subproject commit 45c22ed5f35898b94d59b39da2bf930d48d06eed