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

[menutoolbar] pass current value to fillMenu()

Browse Source
This commit is contained in:
Raphael Coeffic
2021-09-19 10:18:25 +02:00
parent ede2dba2ea
commit 05a858d4c2
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/menutoolbar.h
Vendored
+11 -6
View File
@@ -147,19 +147,24 @@ class MenuToolbar: public FormGroup {
if (vmin > filtermin || vmax < filtermin)
return;
if (choice->isValueAvailable && getFirstAvailable(filtermin, filtermax, choice->isValueAvailable) == 0)
if (choice->isValueAvailable &&
getFirstAvailable(filtermin, filtermax, choice->isValueAvailable) ==
0)
return;
auto button = new MenuToolbarButton(this, {0, y, MENUS_TOOLBAR_BUTTON_WIDTH, MENUS_TOOLBAR_BUTTON_WIDTH}, picto);
auto button = new MenuToolbarButton(
this, {0, y, MENUS_TOOLBAR_BUTTON_WIDTH, MENUS_TOOLBAR_BUTTON_WIDTH},
picto);
button->setPressHandler([=]() {
auto val = choice->getValue();
if (button->checked()) {
choice->fillMenu(menu, [=](int16_t index) {
choice->fillMenu(menu, val, [=](int16_t index) {
return index >= filtermin && index <= filtermax;
});
menu->setFocusBody();
}
else {
choice->fillMenu(menu);
} else {
choice->fillMenu(menu, val);
menu->setFocusBody();
}
return 1;