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

Fixes for Alt key related issues

Browse Source
This commit is contained in:
Imbris 2020-07-15 00:56:50 -04:00
parent 27bfc74928
commit 2f5c8fa3f3
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
voxygen/src/window.rs
View File

@ -475,6 +475,7 @@ pub struct Window {
pub zoom_inversion: bool, pub zoom_inversion: bool,
pub mouse_y_inversion: bool, pub mouse_y_inversion: bool,
fullscreen: bool, fullscreen: bool,
modifiers: winit::event::ModifiersState,
needs_refresh_resize: bool, needs_refresh_resize: bool,
keypress_map: HashMap<GameInput, winit::event::ElementState>, keypress_map: HashMap<GameInput, winit::event::ElementState>,
pub remapping_keybindings: Option<GameInput>, pub remapping_keybindings: Option<GameInput>,
@ -578,6 +579,7 @@ impl Window {
zoom_inversion: settings.gameplay.zoom_inversion, zoom_inversion: settings.gameplay.zoom_inversion,
mouse_y_inversion: settings.gameplay.mouse_y_inversion, mouse_y_inversion: settings.gameplay.mouse_y_inversion,
fullscreen: false, fullscreen: false,
modifiers: Default::default(),
needs_refresh_resize: false, needs_refresh_resize: false,
keypress_map, keypress_map,
remapping_keybindings: None, remapping_keybindings: None,
@ -915,7 +917,32 @@ impl Window {
} }
self.events.push(Event::MouseButton(button, state)); self.events.push(Event::MouseButton(button, state));
}, },
WindowEvent::KeyboardInput { input, .. } => { WindowEvent::ModifiersChanged(modifiers) => self.modifiers = modifiers,
WindowEvent::KeyboardInput {
input,
is_synthetic,
..
} => {
// Ignore synthetic tab presses so that we don't get tabs when alt-tabbing back
// into the window
if matches!(
input.virtual_keycode,
Some(winit::event::VirtualKeyCode::Tab)
) && is_synthetic
{
return;
}
// Ignore Alt-F4 so we don't try to do anything heavy like take a screenshot
// when the window is about to close
if matches!(input, winit::event::KeyboardInput {
state: winit::event::ElementState::Pressed,
virtual_keycode: Some(winit::event::VirtualKeyCode::F4),
..
}) && self.modifiers.alt()
{
return;
}
if let Some(key) = input.virtual_keycode { if let Some(key) = input.virtual_keycode {
if let Some(game_inputs) = Window::map_input( if let Some(game_inputs) = Window::map_input(
KeyMouse::Key(key), KeyMouse::Key(key),