From 5254c8c646568d950e183fac7fb6657dc337f291 Mon Sep 17 00:00:00 2001 From: philmoz Date: Mon, 5 Aug 2024 09:55:08 +1000 Subject: [PATCH] fix(color): display only GV name in mix/input overview when used for weight (#5366) Also fix EL18 mixer edit layout. --- radio/src/gui/colorlcd/controls/source_numberedit.h | 2 +- radio/src/gui/colorlcd/model/mixer_edit.cpp | 2 +- radio/src/strhelpers.cpp | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/controls/source_numberedit.h b/radio/src/gui/colorlcd/controls/source_numberedit.h index 1f3322297..4f12a415e 100644 --- a/radio/src/gui/colorlcd/controls/source_numberedit.h +++ b/radio/src/gui/colorlcd/controls/source_numberedit.h @@ -45,7 +45,7 @@ class SourceNumberEdit : public Window void update(); - static LAYOUT_VAL(NUM_EDIT_W, 84, 74) + static LAYOUT_VAL(NUM_EDIT_W, 84, 84) static LAYOUT_VAL(SRC_BTN_W, 38, 38) protected: diff --git a/radio/src/gui/colorlcd/model/mixer_edit.cpp b/radio/src/gui/colorlcd/model/mixer_edit.cpp index 7a1ee2516..32cd0726b 100644 --- a/radio/src/gui/colorlcd/model/mixer_edit.cpp +++ b/radio/src/gui/colorlcd/model/mixer_edit.cpp @@ -81,7 +81,7 @@ static const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(2), LV_GRID_TEMPLATE_LAST}; static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST}; #else -static const lv_coord_t col_dsc[] = {LV_GRID_FR(2), LV_GRID_FR(3), +static const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(2), LV_GRID_TEMPLATE_LAST}; static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST}; diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp index 5a457c3cd..c302259e0 100644 --- a/radio/src/strhelpers.cpp +++ b/radio/src/strhelpers.cpp @@ -437,8 +437,12 @@ char *getValueOrSrcVarString(char *dest, size_t len, gvar_t value, gvar_t vmin, SourceNumVal v; v.rawValue = value; if (v.isSource) { - const char* s = getSourceString(v.value); - strncpy(dest, s, len); + if (v.value >= MIXSRC_FIRST_GVAR && v.value <= MIXSRC_LAST_GVAR) { + getGVarString(dest, v.value - MIXSRC_FIRST_GVAR); + } else { + const char* s = getSourceString(v.value); + strncpy(dest, s, len); + } } else { v.value += offset; if (usePPMUnit && g_eeGeneral.ppmunit == PPM_US)