Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(color): model info widget may display extra character after model name. #5933

Merged
merged 1 commit into from
Feb 20, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions radio/src/gui/colorlcd/widgets/modelbmp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()});
Expand All @@ -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
Expand Down