language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 22:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix Wasm build error and warnings

Browse source
This commit is contained in:
Olivier Goffart 2021-01-15 15:23:05 +01:00
parent cb0a21115f
commit d65a655333
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sixtyfps_runtime/rendering_backends/gl/lib.rs
View file

@ -1033,9 +1033,12 @@ impl GLFontMetrics {
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
pub fn create_gl_window_with_canvas_id(canvas_id: String) -> ComponentWindow { 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) 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)] #[doc(hidden)]

6
sixtyfps_runtime/rendering_backends/qt/lib.rs
View file

@ -9,8 +9,6 @@
LICENSE END */ LICENSE END */
#![recursion_limit = "512"] #![recursion_limit = "512"]
use std::rc::Rc;
use sixtyfps_corelib::window::ComponentWindow; use sixtyfps_corelib::window::ComponentWindow;
#[cfg(not(no_qt))] #[cfg(not(no_qt))]
@ -99,8 +97,8 @@ impl sixtyfps_corelib::backend::Backend for Backend {
#[cfg(not(no_qt))] #[cfg(not(no_qt))]
{ {
let qt_window = qt_window::QtWindow::new(); let qt_window = qt_window::QtWindow::new();
let window = Rc::new(sixtyfps_corelib::window::Window::new(qt_window.clone())); let window = std::rc::Rc::new(sixtyfps_corelib::window::Window::new(qt_window.clone()));
qt_window.self_weak.set(Rc::downgrade(&window)).ok().unwrap(); qt_window.self_weak.set(std::rc::Rc::downgrade(&window)).ok().unwrap();
ComponentWindow::new(window) ComponentWindow::new(window)
} }
} }