diff --git a/sixtyfps_runtime/rendering_backends/gl/lib.rs b/sixtyfps_runtime/rendering_backends/gl/lib.rs index a100b925f..7a6f8baf2 100644 --- a/sixtyfps_runtime/rendering_backends/gl/lib.rs +++ b/sixtyfps_runtime/rendering_backends/gl/lib.rs @@ -1033,9 +1033,12 @@ impl GLFontMetrics { #[cfg(target_arch = "wasm32")] pub fn create_gl_window_with_canvas_id(canvas_id: String) -> ComponentWindow { - ComponentWindow::new(GraphicsWindow::new(move |event_loop, window_builder| { + let platform_window = GraphicsWindow::new(move |event_loop, window_builder| { GLRenderer::new(&event_loop.get_winit_event_loop(), window_builder, &canvas_id) - })) + }); + let window = Rc::new(sixtyfps_corelib::window::Window::new(platform_window.clone())); + platform_window.self_weak.set(Rc::downgrade(&window)).ok().unwrap(); + ComponentWindow(window) } #[doc(hidden)] diff --git a/sixtyfps_runtime/rendering_backends/qt/lib.rs b/sixtyfps_runtime/rendering_backends/qt/lib.rs index cb8daf3c7..6f2f8c386 100644 --- a/sixtyfps_runtime/rendering_backends/qt/lib.rs +++ b/sixtyfps_runtime/rendering_backends/qt/lib.rs @@ -9,8 +9,6 @@ LICENSE END */ #![recursion_limit = "512"] -use std::rc::Rc; - use sixtyfps_corelib::window::ComponentWindow; #[cfg(not(no_qt))] @@ -99,8 +97,8 @@ impl sixtyfps_corelib::backend::Backend for Backend { #[cfg(not(no_qt))] { let qt_window = qt_window::QtWindow::new(); - let window = Rc::new(sixtyfps_corelib::window::Window::new(qt_window.clone())); - qt_window.self_weak.set(Rc::downgrade(&window)).ok().unwrap(); + let window = std::rc::Rc::new(sixtyfps_corelib::window::Window::new(qt_window.clone())); + qt_window.self_weak.set(std::rc::Rc::downgrade(&window)).ok().unwrap(); ComponentWindow::new(window) } }