Skip to content

skip header items when enabling the InkHUD menu cursor #9552

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
zeropt wants to merge 5 commits into
base: develop
Choose a base branch
from
+25 −1
Open

skip header items when enabling the InkHUD menu cursor #9552

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd48ebc
onNavUp() sets the menu cursor to the last item if not shown
zeropt Feb 5, 2026
5b42c11
skip headers when showing the menu cursor in onNavUp() and onNavDown()
zeropt Feb 6, 2026
101a402
skip headers when showing the menu cursor in onButtonShortPress()
zeropt Feb 6, 2026
8b241fd
Merge branch 'develop' into inkhud-menu-cursor-behavior
thebentern Feb 7, 2026
963ee02
brace cursor incrementing
zeropt Feb 7, 2026
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
26 changes: 25 additions & 1 deletion src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,15 @@ void InkHUD::MenuApplet::onButtonShortPress()
if (!settings->joystick.enabled) {
if (!cursorShown) {
cursorShown = true;
// Select the first item that isn't a header
cursor = 0;
while (cursor < items.size() && items.at(cursor).isHeader) {
cursor++;
}
if (cursor >= items.size()) {
cursorShown = false;
cursor = 0;
}
Comment on lines 1527 to 1535
Copy link

Copilot AI Feb 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The “select first non-header item” logic is duplicated in both onButtonShortPress() and onNavDown(). Consider extracting it into a small helper (and similarly for the “select last non-header” logic) to keep cursor-reveal behavior consistent and reduce the chance of future drift when header-handling changes.

Copilot uses AI. Check for mistakes.
} else {
do {
cursor = (cursor + 1) % items.size();
Expand Down Expand Up @@ -1576,7 +1584,15 @@ void InkHUD::MenuApplet::onNavUp()

if (!cursorShown) {
cursorShown = true;
cursor = 0;
// Select the last item that isn't a header
cursor = items.size() - 1;
while (items.at(cursor).isHeader) {
if (cursor == 0) {
cursorShown = false;
break;
Comment on lines +1587 to +1592
Copy link

Copilot AI Feb 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

onNavUp() sets cursor = items.size() - 1 without guarding for items.empty(). If the items list is empty (e.g., a transient state during page changes), this underflows and items.at(cursor) will throw/abort. Add an early items.empty() check (and keep cursorShown false) before computing the last index, similar to the defensive handling used in onNavDown()/onButtonShortPress().

Copilot uses AI. Check for mistakes.
Copy link
Contributor Author

@zeropt zeropt Feb 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem to be checked in any of the other places where the cursor moved or set. Should I add this guard everywhere the cursor is moved?

}
cursor--;
}
} else {
do {
if (cursor == 0)
Expand All @@ -1597,7 +1613,15 @@ void InkHUD::MenuApplet::onNavDown()

if (!cursorShown) {
cursorShown = true;
// Select the first item that isn't a header
cursor = 0;
while (cursor < items.size() && items.at(cursor).isHeader) {
cursor++;
}
if (cursor >= items.size()) {
cursorShown = false;
cursor = 0;
}
} else {
do {
cursor = (cursor + 1) % items.size();
Expand Down
Loading