thirdpartymirrors/Zelda64Recomp
1
0
Fork 0
mirror of https://github.com/Zelda64Recomp/Zelda64Recomp.git synced 2026-05-02 15:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

default kb input, mouse click switches to kb focused input

Browse source
This commit is contained in:
thecozies 2024-05-01 18:28:08 -05:00
parent e8b54842f2
commit e786cd154f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ui/ui_renderer.cpp
View file

@ -786,7 +786,7 @@ struct UIContext {
public: public:
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 = true; bool cont_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};
@ -1283,6 +1283,7 @@ void draw_hook(RT64::RenderCommandList* command_list, RT64::RenderFramebuffer* s
SDL_Event cur_event{}; SDL_Event cur_event{};
bool mouse_moved = false; bool mouse_moved = false;
bool mouse_clicked = false;
bool non_mouse_interacted = false; bool non_mouse_interacted = false;
bool cont_interacted = false; bool cont_interacted = false;
bool kb_interacted = false; bool kb_interacted = false;
@ -1321,6 +1322,7 @@ void draw_hook(RT64::RenderCommandList* command_list, RT64::RenderFramebuffer* s
// fallthrough // fallthrough
case SDL_EventType::SDL_MOUSEBUTTONDOWN: case SDL_EventType::SDL_MOUSEBUTTONDOWN:
mouse_moved = true; mouse_moved = true;
mouse_clicked = true;
break; break;
case SDL_EventType::SDL_CONTROLLERBUTTONDOWN: { case SDL_EventType::SDL_CONTROLLERBUTTONDOWN: {
@ -1394,7 +1396,7 @@ void draw_hook(RT64::RenderCommandList* command_list, RT64::RenderFramebuffer* s
} }
} // end dequeue event loop } // end dequeue event loop
if (cont_interacted || kb_interacted) { if (cont_interacted || kb_interacted || mouse_clicked) {
recomp::set_cont_active(cont_interacted); recomp::set_cont_active(cont_interacted);
} }
recomp::config_menu_set_cont_or_kb(ui_context->rml.cont_is_active); recomp::config_menu_set_cont_or_kb(ui_context->rml.cont_is_active);