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

Fix cursors being created before SDL2 initialization

This commit is contained in:
Mr-Wiseguy 2024-01-06 13:02:58 -05:00
parent 65fc7f9924
commit def9a39968
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui/ui_renderer.cpp
View File

@ -628,7 +628,7 @@ struct {
Rml::ElementDocument* current_document; Rml::ElementDocument* current_document;
Rml::Element* prev_focused; Rml::Element* prev_focused;
public: public:
SystemInterface_SDL system_interface; std::unique_ptr<SystemInterface_SDL> system_interface;
std::unique_ptr<RmlRenderInterface_RT64> render_interface; std::unique_ptr<RmlRenderInterface_RT64> render_interface;
Rml::Context* context; Rml::Context* context;
recomp::UiEventListenerInstancer event_listener_instancer; recomp::UiEventListenerInstancer event_listener_instancer;
@ -747,11 +747,12 @@ void init_hook(RT64::RenderInterface* interface, RT64::RenderDevice* device) {
UIContext.render.device = device; UIContext.render.device = device;
// Setup RML // Setup RML
UIContext.rml.system_interface.SetWindow(window); UIContext.rml.system_interface = std::make_unique<SystemInterface_SDL>();
UIContext.rml.system_interface->SetWindow(window);
UIContext.rml.render_interface = std::make_unique<RmlRenderInterface_RT64>(&UIContext.render); UIContext.rml.render_interface = std::make_unique<RmlRenderInterface_RT64>(&UIContext.render);
UIContext.rml.make_event_listeners(); UIContext.rml.make_event_listeners();
Rml::SetSystemInterface(&UIContext.rml.system_interface); Rml::SetSystemInterface(UIContext.rml.system_interface.get());
Rml::SetRenderInterface(UIContext.rml.render_interface.get()); Rml::SetRenderInterface(UIContext.rml.render_interface.get());
Rml::Factory::RegisterEventListenerInstancer(&UIContext.rml.event_listener_instancer); Rml::Factory::RegisterEventListenerInstancer(&UIContext.rml.event_listener_instancer);