Skip to content

fix(color): model settings may not be saved when editing global variables #7478

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.

Sign up for GitHub

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

Open
philmoz wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −6
Open

fix(color): model settings may not be saved when editing global variables #7478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions radio/src/gui/colorlcd/model/model_gvars.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,11 +489,10 @@ class GVarEditWindow : public Page
line, rect_t{}, [=] { return fmData->gvars[index] <= GVAR_MAX; },
[=](uint8_t checked) {
fmData->gvars[index] = checked ? 0 : GVAR_MAX + 1;
SET_DIRTY();
setProperties(flightMode);
});
lv_obj_set_style_grid_cell_x_align(cb->getLvObj(), LV_GRID_ALIGN_END,
0);
lv_obj_invalidate(cb->getLvObj());
lv_obj_set_style_grid_cell_x_align(cb->getLvObj(), LV_GRID_ALIGN_END, 0);
} else {
grid.nextCell();
}
Expand Down Expand Up @@ -553,10 +552,15 @@ void ModelGVarsPage::build(Window* window)
editWindow->setCloseHandler([=]() { rebuild(window); });
});
menu->addLine(STR_CLEAR, [=]() {
for (auto& flightMode : g_model.flightModeData) {
for (auto& flightMode : g_model.flightModeData)
flightMode.gvars[index] = 0;
}
storageDirty(EE_MODEL);
SET_DIRTY();
});
menu->addLine(STR_SF_RESET, [=]() {
for (auto& flightMode : g_model.flightModeData)
flightMode.gvars[index] = GVAR_MAX + 1;
g_model.flightModeData[0].gvars[index] = 0;
SET_DIRTY();
});
return 0;
});
Expand Down