piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(color): choice button display not updating if values list changed (#6354)

Browse Source
This commit is contained in:
philmoz
2025-06-13 11:04:54 +10:00
committed by GitHub
parent 1908166bff
commit 8ed3374bcc
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/libui/choice.cpp
+6 -4
View File
@@ -131,17 +131,15 @@ Choice::Choice(Window* parent, const rect_t& rect, const char* const values[],
ChoiceBase(parent, rect, vmin, vmax, title, getValue, setValue, CHOICE_TYPE_DROPOWN)
{
setValues(values);
update();
}
Choice::Choice(Window* parent, const rect_t& rect,
std::vector<std::string> values, int vmin, int vmax,
std::function<int()> getValue,
std::function<void(int)> setValue, const char* title) :
ChoiceBase(parent, rect, vmin, vmax, title, getValue, setValue, CHOICE_TYPE_DROPOWN),
values(std::move(values))
ChoiceBase(parent, rect, vmin, vmax, title, getValue, setValue, CHOICE_TYPE_DROPOWN)
{
update();
setValues(values);
}
void Choice::addValue(const char* value)
@@ -153,6 +151,8 @@ void Choice::addValue(const char* value)
void Choice::setValues(std::vector<std::string> values)
{
this->values = std::move(values);
currentValue = INT_MAX; // Force update
update();
}
void Choice::setValues(const char* const values[])
@@ -164,6 +164,8 @@ void Choice::setValues(const char* const values[])
this->values.emplace_back(*value++);
}
}
currentValue = INT_MAX; // Force update
update();
}
void Choice::setValue(int val)