Skip to content

Commit

Permalink
Revert "macOS Sonoma (14.0) / Xcode 15.0 — Compatibility Fixes + Docs… (
Browse files Browse the repository at this point in the history
bevyengine#9991)

… (bevyengine#9905)"

This reverts commit 20ed3e0.

Issue was already fixed:
rust-windowing/winit#3118
  • Loading branch information
ameknite committed Oct 3, 2023
1 parent 5775207 commit bab5bdf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
6 changes: 4 additions & 2 deletions crates/bevy_winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
8 changes: 0 additions & 8 deletions crates/bevy_winit/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bab5bdf

Please sign in to comment.