fix: wrong label on game switcher entries w/o save state#751
Merged
Conversation
ArjunKdaf
pushed a commit
to ArjunKdaf/kUI
that referenced
this pull request
Jun 24, 2026
carroarmato0
added a commit
to carroarmato0/NextUI
that referenced
this pull request
Jul 2, 2026
Brings the migration branch current with upstream (LoveRetro/NextUI). New upstream work pulled in: white-point colour correction + displaycal for tg5040 (LoveRetro#760), configurable font style and custom system fonts (LoveRetro#748/LoveRetro#729), usb-c card detection before boot (LoveRetro#750), the game-switcher label fix for entries without a save state (LoveRetro#751), readyResume on Quick Menu directory nav (LoveRetro#739). Two upstream commits (LoveRetro#733 cpu governor, LoveRetro#728 Rewind_init) are the same PRs our fork already carried under different SHAs; git merged them cleanly with no duplicated logic. Conflict resolution: - nextui.cpp: upstream still edits the old nextui.c, which we renamed to .cpp. Git followed the rename. The one real conflict was the recent-game preview button hints -- upstream's LoveRetro#751 changed the logic (group 0 always BACK; group 1 shows "A OPEN" when there's no save state instead of RESUME/REMOVE). Took upstream's logic, kept our C++-friendly cast style. - nextui.cpp: LoveRetro#739 added a readyResume call site into nextui.c using the old Array API (->count / ->items[]); rewrote it against std::vector to match the migrated container (top->entries[top->selected]). Also fixes a latent const-correctness bug the full clean build surfaced: the tg5040 device descriptor stores sysfs paths as const char*, but getInt/putInt/putFile took char* -- so libbatmondb (which compiles platform.c with -Werror=discarded-qualifiers) failed once its cached header forced a platform.c recompile. Those helpers only read the path string, so const-ifying the parameter is the correct fix. Verified: full clean build green for both desktop and tg5040 (nextui, minarch, settings).
carroarmato0
added a commit
to carroarmato0/NextUI
that referenced
this pull request
Jul 2, 2026
Every button-hint group was passed as GFX_blitButtonGroup((char**)(const
char*[]){ ... }, ...). That GNU compound-literal argument is miscompiled by
the toolchain's g++ 8.3 -- the callee reads garbage, the pill computes as
zero-width, and nothing draws. Result: no on-screen hints (RESUME/OPEN/BACK
/SLEEP...) anywhere in the launcher.
Confirmed on device by probing one call two ways in the same frame:
named local array -> ow = 259 (correct)
compound literal -> ow = 0 (miscompiled)
The pattern came in with the C->C++ port: the original C used (char*[]){...}
(fine as C); it was cast to satisfy g++, which exposed the codegen bug. Route
the hints through a named local array instead, via a small BTN_HINTS() macro
(statement expression), and apply it to all 11 call sites. Same behaviour,
correct codegen -- hints are back, and the game-switcher RESUME/OPEN split by
save-state (from the upstream LoveRetro#751 merge) now shows correctly too.
ArjunKdaf
added a commit
to ArjunKdaf/kUI
that referenced
this pull request
Jul 2, 2026
- Platform pill moves from a fixed spot (55% of width) to right-anchored just left of the hardware tray, with a small gap. Tray growth (wifi/bt/ clock/OSD) slides the pill left automatically. New api helpers: GFX_hardwareGroupWidth() (tray width as last drawn), GFX_makePlatformPill() and GFX_blitPlatformPill() (shared pill chrome, returns width used). - Pill now also renders on the Game Switcher (selected recent's platform) and in minarch's in-game menu (TrimUI button) — same chrome, same anchor. Title pills in both shrink by the pill's width so long names can't run underneath. - Game Switcher: "Y REMOVE" hint now always visible — the BTN_Y handler removes entries regardless of save state, but the hint vanished on entries without one (regression from absorbing upstream LoveRetro#751). A label still flips RESUME/OPEN on can_resume. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#134