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

fallback for cursor grab mode during window creation #7011

Closed
wants to merge 1 commit into from
+16 −8
Closed

fallback for cursor grab mode during window creation #7011

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
24 changes: 16 additions & 8 deletions crates/bevy_winit/src/winit_windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::converters::convert_cursor_grab_mode;
use bevy_math::{DVec2, IVec2};
use bevy_utils::HashMap;
use bevy_utils::{tracing::error, HashMap};
use bevy_window::{
CursorGrabMode, MonitorSelection, RawHandleWrapper, Window, WindowDescriptor, WindowId,
WindowMode,
Expand Down Expand Up @@ -165,15 +165,23 @@ impl WinitWindows {
}
}

// Do not set the grab mode on window creation if it's none, this can fail on mobile
if window_descriptor.cursor_grab_mode != CursorGrabMode::None {
match winit_window
.set_cursor_grab(convert_cursor_grab_mode(window_descriptor.cursor_grab_mode))
{
Ok(_) | Err(winit::error::ExternalError::NotSupported(_)) => {}
Err(err) => Err(err).unwrap(),
match window_descriptor.cursor_grab_mode {
bevy_window::CursorGrabMode::None => {
// Do not set the grab mode on window creation if it's none, this can fail on mobile
Ok(())
}
bevy_window::CursorGrabMode::Confined => winit_window
.set_cursor_grab(convert_cursor_grab_mode(CursorGrabMode::Confined))
.or_else(|_e| {
winit_window.set_cursor_grab(convert_cursor_grab_mode(CursorGrabMode::Locked))
}),
bevy_window::CursorGrabMode::Locked => winit_window
.set_cursor_grab(convert_cursor_grab_mode(CursorGrabMode::Locked))
.or_else(|_e| {
winit_window.set_cursor_grab(convert_cursor_grab_mode(CursorGrabMode::Confined))
}),
}
.unwrap_or_else(|e| error!("Unable to un/grab cursor: {}", e));

winit_window.set_cursor_visible(window_descriptor.cursor_visible);

Expand Down