From 16a7d02d506ca202dab0b5fbb5c85fd8e3159764 Mon Sep 17 00:00:00 2001 From: philmoz Date: Thu, 20 Feb 2025 22:34:00 +1100 Subject: [PATCH] fix(color): model info widget may display extra character after model name (#5933) --- radio/src/gui/colorlcd/widgets/modelbmp.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/widgets/modelbmp.cpp b/radio/src/gui/colorlcd/widgets/modelbmp.cpp index de2953d53..a364dd540 100644 --- a/radio/src/gui/colorlcd/widgets/modelbmp.cpp +++ b/radio/src/gui/colorlcd/widgets/modelbmp.cpp @@ -38,7 +38,9 @@ class ModelBitmapWidget : public Widget etx_obj_add_style(lvobj, styles->bg_opacity_cover, LV_PART_MAIN | ETX_STATE_BG_FILL); - label = new StaticText(this, rect_t{}, g_model.header.name); + char s[LEN_MODEL_NAME + 1]; + strAppend(s, g_model.header.name, LEN_MODEL_NAME); + label = new StaticText(this, rect_t{}, s); label->hide(); image = new StaticImage(this, rect_t{0, 0, width(), height()}); @@ -57,8 +59,9 @@ class ModelBitmapWidget : public Widget invalidate(); } - if (label->getText() != g_model.header.name) - label->setText(g_model.header.name); + char s[LEN_MODEL_NAME + 1]; + strAppend(s, g_model.header.name, LEN_MODEL_NAME); + label->setText(s); } void update() override