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

[Merged by Bors] - Enable drag-and-drop events on windows #3772

Closed
wants to merge 3 commits into from
Closed

[Merged by Bors] - Enable drag-and-drop events on windows #3772

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1df52c
Enable drag-and-drop events on windows
Veykril Jan 26, 2022
4b861b6
Merge branch 'main' into dragdrop-windows
Veykril Feb 6, 2022
58ca082
Remove cpal requirement from `bevy_audio`
Veykril Apr 4, 2022
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
3 changes: 3 additions & 0 deletions crates/bevy_audio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ bevy_utils = { path = "../bevy_utils", version = "0.6.0" }
# other
anyhow = "1.0.4"
rodio = { version = "0.15", default-features = false }
# we do not directly depend on cpal, but we require at least this version to be used by rodio
# so that the winit feature of drag and drop can be enabled https://github.com/RustAudio/cpal/issues/572
cpal = ">=0.13.4"
Copy link
Member

Choose a reason for hiding this comment

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

I am not very happy with adding this.

Not adding it would mean that some users would have an issue until they run cargo update.
Those users would be those:

I think this set of users is small enough to not add this line to the file

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, that's reasonable. Will just bumping rodio fix this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, rodio merely requires cpal to be 0.13, be it the currently used one or the new version, so it will stick to the old version recorded in the cargo.lock

I figured adding this requirement for a few weeks or so would be a good idea, as that will not cause people's builds to randomly break. Kind of like a transition period for the people that use bevy from the main branch instead of the crates.io version.

Copy link
Member

Choose a reason for hiding this comment

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

IMO we should just remove this. Breakage is much less of a concern than tech debt for this project.

parking_lot = "0.11.0"

[target.'cfg(target_arch = "wasm32")'.dependencies]
Expand Down
7 changes: 0 additions & 7 deletions crates/bevy_winit/src/winit_windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ impl WinitWindows {
window_id: WindowId,
window_descriptor: &WindowDescriptor,
) -> Window {
#[cfg(target_os = "windows")]
let mut winit_window_builder = {
use winit::platform::windows::WindowBuilderExtWindows;
winit::window::WindowBuilder::new().with_drag_and_drop(false)
};

#[cfg(not(target_os = "windows"))]
let mut winit_window_builder = winit::window::WindowBuilder::new();

winit_window_builder = match window_descriptor.mode {
Expand Down