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

feat(color): keep screen options when changing layout (#5530)

Browse Source
This commit is contained in:
philmoz
2024-09-14 12:04:45 +10:00
committed by GitHub
parent d417228677
commit 349ae2e1c1
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/mainview/screen_setup.cpp
+26
View File
@@ -231,7 +231,33 @@ void ScreenSetupPage::build(Window* window)
// delete any options potentially accessing // delete any options potentially accessing
// the old custom screen before re-creating it // the old custom screen before re-creating it
clearLayoutOptions(); clearLayoutOptions();
// If screen is not App Mode then save option values
auto layoutData = &g_model.screenData[customScreenIndex].layoutData;
auto layout = (Layout*)customScreens[customScreenIndex];
bool restoreOptions = false;
bool hasTopbar = true, hasFM = true, hasSliders = true, hasTrims = true, isMirrored = false;
if (!layout->isAppMode()) {
hasTopbar = layoutData->options[LAYOUT_OPTION_TOPBAR].value.boolValue;
hasFM = layoutData->options[LAYOUT_OPTION_FM].value.boolValue;
hasSliders = layoutData->options[LAYOUT_OPTION_SLIDERS].value.boolValue;
hasTrims = layoutData->options[LAYOUT_OPTION_TRIMS].value.boolValue;
isMirrored = layoutData->options[LAYOUT_OPTION_MIRRORED].value.boolValue;
restoreOptions = true;
}
factory->createCustomScreen(customScreenIndex); factory->createCustomScreen(customScreenIndex);
// If new screen is not App Mode then restore saved option values
layout = (Layout*)customScreens[customScreenIndex];
if (restoreOptions && !layout->isAppMode()) {
layoutData->options[LAYOUT_OPTION_TOPBAR].value.boolValue = hasTopbar;
layoutData->options[LAYOUT_OPTION_FM].value.boolValue = hasFM;
layoutData->options[LAYOUT_OPTION_SLIDERS].value.boolValue = hasSliders;
layoutData->options[LAYOUT_OPTION_TRIMS].value.boolValue = hasTrims;
layoutData->options[LAYOUT_OPTION_MIRRORED].value.boolValue = isMirrored;
}
buildLayoutOptions(); buildLayoutOptions();
}; };