From 050067a3a6c89de9ada1715e7934f8bdfda1bb68 Mon Sep 17 00:00:00 2001 From: AmeKnite <104745335+ameknite@users.noreply.github.com> Date: Sun, 1 Oct 2023 14:56:59 -0600 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"macOS=20Sonoma=20(14.0)=20/=20Xco?= =?UTF-8?q?de=2015.0=20=E2=80=94=20Compatibility=20Fixes=20+=20Docs=20(#99?= =?UTF-8?q?05)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 20ed3e0e765405ee334a44ce3c49c72bd29ab753. --- crates/bevy_winit/src/lib.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs index 3947b5020a867..a13c158709bfe 100644 --- a/crates/bevy_winit/src/lib.rs +++ b/crates/bevy_winit/src/lib.rs @@ -441,14 +441,6 @@ pub fn winit_runner(mut app: App) { match event { WindowEvent::Resized(size) => { - // TODO: Remove this once we upgrade winit to a version with the fix - #[cfg(target_os = "macos")] - if size.width == u32::MAX || size.height == u32::MAX { - // HACK to fix a bug on Macos 14 - // https://github.com/rust-windowing/winit/issues/2876 - return; - } - window .resolution .set_physical_resolution(size.width, size.height); From 58f105c4fe3759520aeee679d6fcfe21674e253d Mon Sep 17 00:00:00 2001 From: AmeKnite <104745335+ameknite@users.noreply.github.com> Date: Sun, 1 Oct 2023 18:14:20 -0600 Subject: [PATCH 2/2] constraint winit to 0.28.7+ --- crates/bevy_winit/Cargo.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/bevy_winit/Cargo.toml b/crates/bevy_winit/Cargo.toml index fd7d4d3a373c1..ab388a06a7376 100644 --- a/crates/bevy_winit/Cargo.toml +++ b/crates/bevy_winit/Cargo.toml @@ -28,13 +28,15 @@ bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" } bevy_tasks = { path = "../bevy_tasks", version = "0.12.0-dev" } # other -winit = { version = "0.28", default-features = false } +winit = { version = "0.28.7", default-features = false } accesskit_winit = { version = "0.14", default-features = false } approx = { version = "0.5", default-features = false } raw-window-handle = "0.5" [target.'cfg(target_os = "android")'.dependencies] -winit = { version = "0.28", default-features = false, features = ["android-native-activity"] } +winit = { version = "0.28.7", default-features = false, features = [ + "android-native-activity", +] } [target.'cfg(target_arch = "wasm32")'.dependencies] wasm-bindgen = { version = "0.2" }