[menutoolbar] pass current value to fillMenu()

This commit is contained in:
Raphael Coeffic
2021-09-19 10:18:25 +02:00
parent ede2dba2ea
commit 05a858d4c2
+11 -6
View File
@@ -147,19 +147,24 @@ class MenuToolbar: public FormGroup {
if (vmin > filtermin || vmax < filtermin) if (vmin > filtermin || vmax < filtermin)
return; return;
if (choice->isValueAvailable && getFirstAvailable(filtermin, filtermax, choice->isValueAvailable) == 0) if (choice->isValueAvailable &&
getFirstAvailable(filtermin, filtermax, choice->isValueAvailable) ==
0)
return; 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([=]() { button->setPressHandler([=]() {
auto val = choice->getValue();
if (button->checked()) { if (button->checked()) {
choice->fillMenu(menu, [=](int16_t index) { choice->fillMenu(menu, val, [=](int16_t index) {
return index >= filtermin && index <= filtermax; return index >= filtermin && index <= filtermax;
}); });
menu->setFocusBody(); menu->setFocusBody();
} } else {
else { choice->fillMenu(menu, val);
choice->fillMenu(menu);
menu->setFocusBody(); menu->setFocusBody();
} }
return 1; return 1;