Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'carbonhell/cursor_grabbed_fix' into 'master'

Browse Source 
Fixes mouseinput event ignoring cursor_grabbed being true

See merge request veloren/veloren!895
This commit is contained in:
Monty Marz 2020-04-08 23:03:47 +00:00
commit f90c602c41
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
voxygen/src/window.rs
View File

@ -509,10 +509,13 @@ impl Window {
}, },
glutin::WindowEvent::ReceivedCharacter(c) => events.push(Event::Char(c)), glutin::WindowEvent::ReceivedCharacter(c) => events.push(Event::Char(c)),
glutin::WindowEvent::MouseInput { button, state, .. } => { glutin::WindowEvent::MouseInput { button, state, .. } => {
if let Some(game_inputs) = Window::map_input( if let (true, Some(game_inputs)) = (
cursor_grabbed,
Window::map_input(
KeyMouse::Mouse(button), KeyMouse::Mouse(button),
controls, controls,
remapping_keybindings, remapping_keybindings,
),
) { ) {
for game_input in game_inputs { for game_input in game_inputs {
events.push(Event::InputUpdate( events.push(Event::InputUpdate(