Merge branch 'carbonhell/cursor_grabbed_fix' into 'master'

Fixes mouseinput event ignoring cursor_grabbed being true See merge request veloren/veloren!895
2024-08-30 18:12:32 +00:00 · 2020-04-08 23:03:47 +00:00 · 2020-04-08 23:03:47 +00:00 · 9427d5154b
commit 9427d5154b
parent 1567e77a39 20ec77eeb0
1 changed files with 7 additions and 4 deletions
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@ -509,10 +509,13 @@ impl Window {
                    },
                    glutin::WindowEvent::ReceivedCharacter(c) => events.push(Event::Char(c)),
                    glutin::WindowEvent::MouseInput { button, state, .. } => {
-                        if let Some(game_inputs) = Window::map_input(
-                            KeyMouse::Mouse(button),
-                            controls,
-                            remapping_keybindings,
+                        if let (true, Some(game_inputs)) = (
+                            cursor_grabbed,
+                            Window::map_input(
+                                KeyMouse::Mouse(button),
+                                controls,
+                                remapping_keybindings,
+                            ),
                        ) {
                            for game_input in game_inputs {
                                events.push(Event::InputUpdate(