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.

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

Non-breaking change* from UK spellings to US #8291

Merged
merged 17 commits into from
Apr 8, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Change back api calls accidental rename
  • Loading branch information
BlackPhlox committed Apr 2, 2023
commit d02ecf5aca3e3b9e4b7b1865aeb18404e119b6b6
2 changes: 1 addition & 1 deletion crates/bevy_input/src/touch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ mod test {
}

#[test]
fn touch_cancelled() {
fn touch_canceled() {
use crate::{touch::TouchPhase, TouchInput, Touches};
use bevy_math::Vec2;

Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_winit/src/converters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub fn convert_touch_input(
winit::event::TouchPhase::Started => TouchPhase::Started,
winit::event::TouchPhase::Moved => TouchPhase::Moved,
winit::event::TouchPhase::Ended => TouchPhase::Ended,
winit::event::TouchPhase::Canceled => TouchPhase::Canceled,
winit::event::TouchPhase::Cancelled => TouchPhase::Canceled,
},
position: Vec2::new(location.x as f32, location.y as f32),
force: touch_input.force.map(|f| match f {
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_winit/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ pub fn winit_runner(mut app: App) {
path_buf,
});
}
WindowEvent::HoveredFileCanceled => {
WindowEvent::HoveredFileCancelled => {
file_drag_and_drop_events.send(FileDragAndDrop::HoveredFileCanceled {
window: window_entity,
});
Expand Down