Add support for Apple Silicon by upgrading winit. (#1043)

bevyengine · Dec 13, 2020 · 9602b24 · 9602b24
1 parent 509b138
commit 9602b24
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,8 @@ current changes on git with [previous release tags][git_tag_comparison].
 - [Added new Bevy reflection system][926]
   - Replaces the properties system
 - [Add removal_detection example][945]
+- [Add support for Apple Silicon][928]
+- [Allow windows to be maximized][1001]
 
 ### Changed
 
@@ -39,6 +41,7 @@ current changes on git with [previous release tags][git_tag_comparison].
 - [Use `mailbox` instead of `fifo` for vsync on supported systems][920]
 - [Break out Visible component from Draw][1034]
   - Users setting `Draw::is_visible` or `Draw::is_transparent` should now set `Visible::is_visible` and `Visible::is_transparent`
+- [`winit` upgraded from version 0.23 to version 0.24][1043]
 
 ### Fixed
 
@@ -66,11 +69,14 @@ current changes on git with [previous release tags][git_tag_comparison].
 [917]: https://github.com/bevyengine/bevy/pull/917
 [920]: https://github.com/bevyengine/bevy/pull/920
 [926]: https://github.com/bevyengine/bevy/pull/926
+[928]: https://github.com/bevyengine/bevy/pull/928
 [931]: https://github.com/bevyengine/bevy/pull/931
 [934]: https://github.com/bevyengine/bevy/pull/934
 [945]: https://github.com/bevyengine/bevy/pull/945
 [955]: https://github.com/bevyengine/bevy/pull/955
+[1001]: https://github.com/bevyengine/bevy/pull/1001
 [1034]: https://github.com/bevyengine/bevy/pull/1034
+[1043]: https://github.com/bevyengine/bevy/pull/1043
 
 ## Version 0.3.0 (2020-11-03)
 

diff --git a/crates/bevy_input/src/mouse.rs b/crates/bevy_input/src/mouse.rs
@@ -17,7 +17,7 @@ pub enum MouseButton {
     Left,
     Right,
     Middle,
-    Other(u8),
+    Other(u16),
 }
 
 /// A mouse motion event

diff --git a/crates/bevy_winit/Cargo.toml b/crates/bevy_winit/Cargo.toml
@@ -26,9 +26,9 @@ bevy_window = { path = "../bevy_window", version = "0.3.0" }
 bevy_utils = { path = "../bevy_utils", version = "0.3.0" }
 
 # other
-winit = { version = "0.23.0", default-features = false }
+winit = { version = "0.24.0", default-features = false }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-winit = { version = "0.23.0", features = ["web-sys"], default-features = false }
+winit = { version = "0.24.0", features = ["web-sys"], default-features = false }
 wasm-bindgen = { version = "0.2" }
 web-sys = "0.3"
diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs
@@ -138,7 +138,7 @@ fn run_return<F>(event_loop: &mut EventLoop<()>, event_handler: F)
 where
     F: FnMut(Event<'_, ()>, &EventLoopWindowTarget<()>, &mut ControlFlow),
 {
-    use winit::platform::desktop::EventLoopExtDesktop;
+    use winit::platform::run_return::EventLoopExtRunReturn;
     event_loop.run_return(event_handler)
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ pub enum MouseButton { @@
         Left,
         Right,
         Middle,
-        Other(u8),
+        Other(u16),
     }
     /// A mouse motion event
@@ Expand Down @@