Skip to content

Commit 272f4a4

Browse files
committed
Copy fix from bevyengine#9684 to test Android.
1 parent ac28b11 commit 272f4a4

File tree

1 file changed

+7
-51
lines changed

1 file changed

+7
-51
lines changed

crates/bevy_winit/src/lib.rs

Lines changed: 7 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use bevy_window::{
4848
pub use winit::platform::android::activity::AndroidApp;
4949

5050
use winit::{
51-
event::{self, DeviceEvent, Event, StartCause, WindowEvent},
51+
event::{self, DeviceEvent, Event, WindowEvent},
5252
event_loop::{ControlFlow, EventLoop, EventLoopBuilder, EventLoopWindowTarget},
5353
};
5454

@@ -364,57 +364,13 @@ pub fn winit_runner(mut app: App) {
364364
}
365365

366366
match event {
367-
event::Event::NewEvents(start_cause) => match start_cause {
368-
StartCause::Init => {
369-
#[cfg(any(target_os = "android", target_os = "ios", target_os = "macos"))]
370-
{
371-
#[cfg(not(target_arch = "wasm32"))]
372-
let (
373-
commands,
374-
mut windows,
375-
event_writer,
376-
winit_windows,
377-
adapters,
378-
handlers,
379-
accessibility_requested,
380-
) = create_window_system_state.get_mut(&mut app.world);
381-
382-
#[cfg(target_arch = "wasm32")]
383-
let (
384-
commands,
385-
mut windows,
386-
event_writer,
387-
winit_windows,
388-
adapters,
389-
handlers,
390-
accessibility_requested,
391-
event_channel,
392-
) = create_window_system_state.get_mut(&mut app.world);
393-
394-
create_windows(
395-
event_loop,
396-
commands,
397-
windows.iter_mut(),
398-
event_writer,
399-
winit_windows,
400-
adapters,
401-
handlers,
402-
accessibility_requested,
403-
#[cfg(target_arch = "wasm32")]
404-
event_channel,
405-
);
406-
407-
create_window_system_state.apply(&mut app.world);
408-
}
409-
}
410-
_ => {
411-
if let Some(t) = runner_state.scheduled_update {
412-
let now = Instant::now();
413-
let remaining = t.checked_duration_since(now).unwrap_or(Duration::ZERO);
414-
runner_state.wait_elapsed = remaining.is_zero();
415-
}
367+
event::Event::NewEvents(_) => {
368+
if let Some(t) = runner_state.scheduled_update {
369+
let now = Instant::now();
370+
let remaining = t.checked_duration_since(now).unwrap_or(Duration::ZERO);
371+
runner_state.wait_elapsed = remaining.is_zero();
416372
}
417-
},
373+
}
418374
event::Event::WindowEvent {
419375
event, window_id, ..
420376
} => {

0 commit comments

Comments
 (0)