mirror of
https://github.com/Zelda64Recomp/Zelda64Recomp.git
synced 2026-04-27 20:51:40 +00:00
Turn off tab searching when submenu is open.
This commit is contained in:
parent
823cfe9a27
commit
92b7c79753
1 changed files with 6 additions and 1 deletions
|
|
@ -764,6 +764,7 @@ struct UIContext {
|
|||
bool mouse_is_active_initialized = false;
|
||||
bool mouse_is_active = false;
|
||||
bool cont_is_active = false;
|
||||
bool submenu_is_active = false;
|
||||
bool await_stick_return_x = false;
|
||||
bool await_stick_return_y = false;
|
||||
int last_active_mouse_position[2] = {0, 0};
|
||||
|
|
@ -872,6 +873,8 @@ struct UIContext {
|
|||
config_tabset->SetProperty(Rml::PropertyId::Display, Rml::Style::Display::None);
|
||||
config_sub_menu->set_display(true);
|
||||
}
|
||||
|
||||
submenu_is_active = true;
|
||||
}
|
||||
|
||||
void quit_sub_menu() {
|
||||
|
|
@ -881,6 +884,8 @@ struct UIContext {
|
|||
config_tabset->SetProperty(Rml::PropertyId::Display, Rml::Style::Display::Flex);
|
||||
config_sub_menu->set_display(false);
|
||||
}
|
||||
|
||||
submenu_is_active = false;
|
||||
}
|
||||
|
||||
void load_documents() {
|
||||
|
|
@ -973,7 +978,7 @@ struct UIContext {
|
|||
}
|
||||
|
||||
if (cont_is_active || non_mouse_interacted) {
|
||||
if (non_mouse_interacted) {
|
||||
if (non_mouse_interacted && !submenu_is_active) {
|
||||
auto focusedEl = current_document->GetFocusLeafNode();
|
||||
if (focusedEl == nullptr || RecompRml::CanFocusElement(focusedEl) != RecompRml::CanFocus::Yes) {
|
||||
Rml::Element* element = find_autofocus_element(current_document);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue