leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(wayland): don't reapply same cursor grab

Browse source 
Some compositors break when re-taking the same grab.

Closes: https://github.com/rust-windowing/winit/issues/3566
This commit is contained in:
Kirill Chibisov 2024-03-05 14:27:40 +04:00
parent f6f1c45a72
commit fc8a008b25
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -11,6 +11,7 @@ Unreleased` header.
# Unreleased # Unreleased
- On Wayland, don't reapply cursor grab when unchanged.
- Move `dpi` types to its own crate, and re-export it from the root crate. - Move `dpi` types to its own crate, and re-export it from the root crate.
- Implement `Sync` for `EventLoopProxy<T: Send>`. - Implement `Sync` for `EventLoopProxy<T: Send>`.
- **Breaking:** Move `Window::new` to `ActiveEventLoop::create_window` and `EventLoop::create_window` (with the latter being deprecated). - **Breaking:** Move `Window::new` to `ActiveEventLoop::create_window` and `EventLoop::create_window` (with the latter being deprecated).

9
src/platform_impl/linux/wayland/window/state.rs
View file

@ -826,9 +826,14 @@ impl WindowState {
/// Set the cursor grabbing state on the top-level. /// Set the cursor grabbing state on the top-level.
pub fn set_cursor_grab(&mut self, mode: CursorGrabMode) -> Result<(), ExternalError> { pub fn set_cursor_grab(&mut self, mode: CursorGrabMode) -> Result<(), ExternalError> {
// Replace the user grabbing mode. if self.cursor_grab_mode.user_grab_mode == mode {
return Ok(());
}
self.set_cursor_grab_inner(mode)?;
// Update user grab on success.
self.cursor_grab_mode.user_grab_mode = mode; self.cursor_grab_mode.user_grab_mode = mode;
self.set_cursor_grab_inner(mode) Ok(())
} }
/// Reload the hints for minimum and maximum sizes. /// Reload the hints for minimum and maximum sizes.