From 6fd580244acb2839b478ada211777619078d17da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Fri, 22 Dec 2023 07:08:43 +0100 Subject: [PATCH] fix patches for example showcase after winit update (#11058) # Objective - #10702 introduced some changes that broke patches for the example showcase ## Solution - Update those patches --- tools/example-showcase/extra-window-resized-events.patch | 6 +++--- tools/example-showcase/remove-desktop-app-mode.patch | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/example-showcase/extra-window-resized-events.patch b/tools/example-showcase/extra-window-resized-events.patch index 66dcdfc1535d8..31c184d014f04 100644 --- a/tools/example-showcase/extra-window-resized-events.patch +++ b/tools/example-showcase/extra-window-resized-events.patch @@ -1,8 +1,8 @@ diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs -index 91c9858c7..9f93f05d0 100644 +index 6a320bb2f..4d8b46c5f 100644 --- a/crates/bevy_winit/src/lib.rs +++ b/crates/bevy_winit/src/lib.rs -@@ -510,6 +510,12 @@ pub fn winit_runner(mut app: App) { +@@ -469,6 +469,12 @@ pub fn winit_runner(mut app: App) { runner_state.window_event_received = true; @@ -14,4 +14,4 @@ index 91c9858c7..9f93f05d0 100644 + match event { WindowEvent::Resized(size) => { - window + react_to_resize(&mut window, size, &mut event_writers, window_entity); diff --git a/tools/example-showcase/remove-desktop-app-mode.patch b/tools/example-showcase/remove-desktop-app-mode.patch index d3b5bf3e126e4..725215214654e 100644 --- a/tools/example-showcase/remove-desktop-app-mode.patch +++ b/tools/example-showcase/remove-desktop-app-mode.patch @@ -1,8 +1,8 @@ diff --git a/crates/bevy_winit/src/winit_config.rs b/crates/bevy_winit/src/winit_config.rs -index c71a92814..b138d07a0 100644 +index b91e25d34..48f19b708 100644 --- a/crates/bevy_winit/src/winit_config.rs +++ b/crates/bevy_winit/src/winit_config.rs -@@ -47,15 +47,7 @@ impl WinitSettings { +@@ -29,14 +29,7 @@ impl WinitSettings { /// [`Reactive`](UpdateMode::Reactive) if windows have focus, /// [`ReactiveLowPower`](UpdateMode::ReactiveLowPower) otherwise. pub fn desktop_app() -> Self { @@ -13,7 +13,6 @@ index c71a92814..b138d07a0 100644 - unfocused_mode: UpdateMode::ReactiveLowPower { - wait: Duration::from_secs(60), - }, -- ..Default::default() - } + Self::game() }