Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Apple Silicon by upgrading winit. #1043

Merged
merged 1 commit into from
Dec 13, 2020
+10 −4
Merged

Add support for Apple Silicon by upgrading winit. #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_input/src/mouse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub enum MouseButton {
Left,
Right,
Middle,
Other(u8),
Other(u16),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rust-windowing/winit#1787

}

/// A mouse motion event
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_winit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion crates/bevy_winit/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down