Skip to content

Handle selection after menu update #670

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
themuffinator wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle selection after menu update #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/server/g_local.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6061,7 +6061,7 @@ class Menu {
void Next();
void Prev();
void Select(gentity_t* ent);
void Render(gentity_t* ent) const;
void Render(gentity_t* ent);
void EnsureCurrentVisible();
};

Expand Down
18 changes: 17 additions & 1 deletion src/server/menu/menu_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,26 @@ void Menu::Select(gentity_t* ent) {
Menu::Render
===============
*/
void Menu::Render(gentity_t* ent) const {
void Menu::Render(gentity_t* ent) {
if (onUpdate)
onUpdate(ent, *this);

if (current >= 0 && current < static_cast<int>(entries.size()) && !entries[current].onSelect) {
const int original = current;

Next();

if (current == original || current < 0 || current >= static_cast<int>(entries.size()) || !entries[current].onSelect) {
current = original;
Prev();

if (current == original || current < 0 || current >= static_cast<int>(entries.size()) || !entries[current].onSelect)
current = -1;
}
}

EnsureCurrentVisible();

// Do not early-return if current is invalid; still render the menu
const int selected = (current >= 0 && current < static_cast<int>(entries.size())) ? current : -1;

Expand Down