pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-07-31 02:45:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Don't return to top of the list when toggling values

Browse Source
This commit is contained in:
Jason P 2025-07-21 18:01:38 -05:00
parent 2bd31cb66a
commit 8eb68598bf
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/graphics/draw/MenuHandler.cpp
View File

@ -1110,6 +1110,9 @@ void menuHandler::FrameToggles_menu()
static int optionsEnumArray[enumEnd] = {Finish}; static int optionsEnumArray[enumEnd] = {Finish};
int options = 1; int options = 1;
// Track last selected index (not enum value!)
static int lastSelectedIndex = 0;
#ifndef USE_EINK #ifndef USE_EINK
optionsArray[options] = screen->isFrameHidden("nodelist") ? "Show Node List" : "Hide Node List"; optionsArray[options] = screen->isFrameHidden("nodelist") ? "Show Node List" : "Hide Node List";
optionsEnumArray[options++] = nodelist; optionsEnumArray[options++] = nodelist;
@ -1144,7 +1147,17 @@ void menuHandler::FrameToggles_menu()
bannerOptions.optionsArrayPtr = optionsArray; bannerOptions.optionsArrayPtr = optionsArray;
bannerOptions.optionsCount = options; bannerOptions.optionsCount = options;
bannerOptions.optionsEnumPtr = optionsEnumArray; bannerOptions.optionsEnumPtr = optionsEnumArray;
bannerOptions.bannerCallback = [](int selected) -> void { bannerOptions.InitialSelected = lastSelectedIndex; // Use index, not enum value
bannerOptions.bannerCallback = [optionsEnumArray, options](int selected) mutable -> void {
// Find the index of selected in optionsEnumArray
int idx = 0;
for (; idx < options; ++idx) {
if (optionsEnumArray[idx] == selected)
break;
}
lastSelectedIndex = idx;
if (selected == Finish) { if (selected == Finish) {
screen->setFrames(Screen::FOCUS_DEFAULT); screen->setFrames(Screen::FOCUS_DEFAULT);
} else if (selected == nodelist) { } else if (selected == nodelist) {