forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use WindowBuilder::with_append() to append canvas (#11065)

Browse Source 
# Objective

Replace the canvas appending code with a simpler version provided by
Winit v0.29.

Related: #11052.

## Solution

Use
[`WindowBuilder::with_append()`](https://docs.rs/winit/0.29.5/wasm32-unknown-unknown/winit/platform/web/trait.WindowBuilderExtWebSys.html#tymethod.with_append).
This commit is contained in:
daxpedda 2023-12-24 18:44:50 +01:00 committed by GitHub
parent 1568d4a415
commit dc698f0174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/bevy_winit/src/winit_windows.rs
View File

@ -140,7 +140,8 @@ impl WinitWindows {
} }
winit_window_builder = winit_window_builder =
winit_window_builder.with_prevent_default(window.prevent_default_event_handling) winit_window_builder.with_prevent_default(window.prevent_default_event_handling);
winit_window_builder = winit_window_builder.with_append(true);
} }
let winit_window = winit_window_builder.build(event_loop).unwrap(); let winit_window = winit_window_builder.build(event_loop).unwrap();
@ -189,22 +190,6 @@ impl WinitWindows {
self.entity_to_winit.insert(entity, winit_window.id()); self.entity_to_winit.insert(entity, winit_window.id());
self.winit_to_entity.insert(winit_window.id(), entity); self.winit_to_entity.insert(winit_window.id(), entity);
#[cfg(target_arch = "wasm32")]
{
use winit::platform::web::WindowExtWebSys;
if window.canvas.is_none() {
let canvas = winit_window.canvas().expect("Failed to retrieve canvas.");
let window = web_sys::window().unwrap();
let document = window.document().unwrap();
let body = document.body().unwrap();
body.append_child(&canvas)
.expect("Append canvas to HTML body.");
}
}
self.windows self.windows
.entry(winit_window.id()) .entry(winit_window.id())
.insert(winit_window) .insert(winit_window)