thirdpartymirrors/Zelda64Recomp
1
0
Fork 0
mirror of https://github.com/Zelda64Recomp/Zelda64Recomp.git synced 2025-10-30 08:03:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Turn off tab searching when submenu is open.

Browse source
This commit is contained in:
Dario 2025-01-18 23:11:43 -03:00 • committed by Mr-Wiseguy
parent e72085404b
commit 635142cda9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ui/ui_renderer.cpp
View file

@ -775,6 +775,7 @@ struct UIContext {
bool mouse_is_active_initialized = false; bool mouse_is_active_initialized = false;
bool mouse_is_active = false; bool mouse_is_active = false;
bool cont_is_active = false; bool cont_is_active = false;
bool submenu_is_active = false;
bool await_stick_return_x = false; bool await_stick_return_x = false;
bool await_stick_return_y = false; bool await_stick_return_y = false;
int last_active_mouse_position[2] = {0, 0}; int last_active_mouse_position[2] = {0, 0};
@ -883,6 +884,8 @@ struct UIContext {
config_tabset->SetProperty(Rml::PropertyId::Display, Rml::Style::Display::None); config_tabset->SetProperty(Rml::PropertyId::Display, Rml::Style::Display::None);
config_sub_menu->set_display(true); config_sub_menu->set_display(true);
} }
submenu_is_active = true;
} }
void quit_sub_menu() { void quit_sub_menu() {
@ -892,6 +895,8 @@ struct UIContext {
config_tabset->SetProperty(Rml::PropertyId::Display, Rml::Style::Display::Flex); config_tabset->SetProperty(Rml::PropertyId::Display, Rml::Style::Display::Flex);
config_sub_menu->set_display(false); config_sub_menu->set_display(false);
} }
submenu_is_active = false;
} }
void load_documents() { void load_documents() {
@ -984,7 +989,7 @@ struct UIContext {
} }
if (cont_is_active || non_mouse_interacted) { if (cont_is_active || non_mouse_interacted) {
if (non_mouse_interacted) { if (non_mouse_interacted && !submenu_is_active) {
auto focusedEl = current_document->GetFocusLeafNode(); auto focusedEl = current_document->GetFocusLeafNode();
if (focusedEl == nullptr || RecompRml::CanFocusElement(focusedEl) != RecompRml::CanFocus::Yes) { if (focusedEl == nullptr || RecompRml::CanFocusElement(focusedEl) != RecompRml::CanFocus::Yes) {
Rml::Element* element = find_autofocus_element(current_document); Rml::Element* element = find_autofocus_element(current_document);