Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-26 23:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix home_pages_mask=0 inconsistency and navPage fallback

Browse Source 
- Remove mask==0 guard from isPageVisible/homePageVisible/toggle:
  mask=0 now correctly means "all optional pages hidden" instead of
  silently reverting to all-visible. Initialization always sets 0x01FF
  before loadPrefs so 0 only occurs if user explicitly hides everything.
- Simplify toggle handler: direct XOR on home_pages_mask.
- HomeScreen: use navPage(+1) as fallback when current page becomes
  hidden, instead of always jumping to i=0.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-05-12 09:57:21 +02:00
parent 2fc9e094e7
commit f0f142890f
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/companion_radio/ui-new/UITask.cpp
View File

@@ -295,7 +295,6 @@ class SettingsScreen : public UIScreen {
uint16_t bit = homePageBit(item);
if (!bit) return false;
uint16_t mask = p ? p->home_pages_mask : HP_ALL;
if (mask == 0) mask = HP_ALL;
return (mask & bit) != 0;
}
@@ -679,9 +678,7 @@ public:
return right || left;
}
if (isHomePage(_selected) && p && (left || right || enter)) {
uint16_t bit = homePageBit(_selected);
uint16_t mask = p->home_pages_mask ? p->home_pages_mask : HP_ALL;
p->home_pages_mask = mask ^ bit;
p->home_pages_mask ^= homePageBit(_selected);
_dirty = true;
return true;
}
@@ -2169,7 +2166,6 @@ class HomeScreen : public UIScreen {
int bit = pageBit(page);
if (bit < 0) return true;
uint16_t mask = _node_prefs ? _node_prefs->home_pages_mask : HP_ALL;
if (mask == 0) mask = HP_ALL;
return (mask >> bit) & 1;
}
@@ -2325,9 +2321,7 @@ public:
renderBatteryIndicator(display, _task->getBattMilliVolts());
// ensure current page is visible (e.g. after settings change)
if (!isPageVisible(_page)) {
for (int i = 0; i < (int)Count; i++) { if (isPageVisible(i)) { _page = i; break; } }
}
if (!isPageVisible(_page)) _page = navPage(_page, +1);
// curr page indicator — only visible pages get a dot
{