Mirrors
/
Zelda64Recomp
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed resizing causing incorrect RmlUi context size sometimes and fixed some crashes on exit

This commit is contained in:
Mr-Wiseguy 2024-01-19 18:44:43 -05:00
parent d6e4e98c8b
commit b4bb64e688
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui/ui_renderer.cpp
View File

@ -741,6 +741,7 @@ struct {
Rml::Context* context; Rml::Context* context;
recomp::UiEventListenerInstancer event_listener_instancer; recomp::UiEventListenerInstancer event_listener_instancer;
int32_t ui_scale = 4; int32_t ui_scale = 4;
std::mutex draw_mutex;
void unload() { void unload() {
render_interface.reset(); render_interface.reset();
@ -947,6 +948,7 @@ std::atomic<recomp::Menu> open_menu = recomp::Menu::Launcher;
std::atomic<recomp::ConfigSubmenu> open_config_submenu = recomp::ConfigSubmenu::Count; std::atomic<recomp::ConfigSubmenu> open_config_submenu = recomp::ConfigSubmenu::Count;
void draw_hook(RT64::RenderCommandList* command_list, RT64::RenderFramebuffer* swap_chain_framebuffer) { void draw_hook(RT64::RenderCommandList* command_list, RT64::RenderFramebuffer* swap_chain_framebuffer) {
std::lock_guard lock {UIContext.rml.draw_mutex};
int num_keys; int num_keys;
const Uint8* key_state = SDL_GetKeyboardState(&num_keys); const Uint8* key_state = SDL_GetKeyboardState(&num_keys);
@ -980,7 +982,7 @@ void draw_hook(RT64::RenderCommandList* command_list, RT64::RenderFramebuffer* s
bool mouse_moved = false; bool mouse_moved = false;
while (recomp::try_deque_event(cur_event)) { while (recomp::try_deque_event(cur_event)) {
// Scale coordinates for mouse events based on the UI scale // Scale coordinates for mouse and window events based on the UI scale
switch (cur_event.type) { switch (cur_event.type) {
case SDL_EventType::SDL_MOUSEMOTION: case SDL_EventType::SDL_MOUSEMOTION:
cur_event.motion.x *= UIContext.rml.ui_scale; cur_event.motion.x *= UIContext.rml.ui_scale;
@ -997,6 +999,12 @@ void draw_hook(RT64::RenderCommandList* command_list, RT64::RenderFramebuffer* s
cur_event.wheel.x *= UIContext.rml.ui_scale; cur_event.wheel.x *= UIContext.rml.ui_scale;
cur_event.wheel.y *= UIContext.rml.ui_scale; cur_event.wheel.y *= UIContext.rml.ui_scale;
break; break;
case SDL_EventType::SDL_WINDOWEVENT:
if (cur_event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
cur_event.window.data1 *= UIContext.rml.ui_scale;
cur_event.window.data2 *= UIContext.rml.ui_scale;
}
break;
} }
RmlSDL::InputEventHandler(UIContext.rml.context, cur_event); RmlSDL::InputEventHandler(UIContext.rml.context, cur_event);
@ -1053,6 +1061,7 @@ void draw_hook(RT64::RenderCommandList* command_list, RT64::RenderFramebuffer* s
static int prev_height = 0; static int prev_height = 0;
if (prev_width != width || prev_height != height) { if (prev_width != width || prev_height != height) {
printf("changed to %d by %d\n", width, height);
UIContext.rml.context->SetDimensions({ (int)(width * UIContext.rml.ui_scale), (int)(height * UIContext.rml.ui_scale) }); UIContext.rml.context->SetDimensions({ (int)(width * UIContext.rml.ui_scale), (int)(height * UIContext.rml.ui_scale) });
} }
prev_width = width; prev_width = width;
@ -1081,6 +1090,8 @@ void recomp::set_config_submenu(recomp::ConfigSubmenu submenu) {
} }
void recomp::destroy_ui() { void recomp::destroy_ui() {
std::lock_guard lock {UIContext.rml.draw_mutex};
UIContext.rml.font_interface.reset();
Rml::Shutdown(); Rml::Shutdown();
UIContext.rml.unload(); UIContext.rml.unload();
} }