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

Fix hud handle_event() match arm order

Browse Source 
Former-commit-id: 484b74fc9d82a18b5ac4d7da2dedcd426d100041
This commit is contained in:
Imbris 2019-05-26 12:10:35 -04:00
parent 48a905ba86
commit 8754ea1661
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
voxygen/src/hud/mod.rs
View File

@ -622,6 +622,17 @@ impl Hud {
} }
true true
} }
WinEvent::InputUpdate(GameInput::ToggleInterface, true) => {
self.show.toggle_ui();
true
}
WinEvent::InputUpdate(GameInput::ToggleCursor, true) => {
self.force_ungrab = !self.force_ungrab;
if self.force_ungrab {
global_state.window.grab_cursor(false);
}
true
}
_ if !self.show.ui => false, _ if !self.show.ui => false,
WinEvent::Zoom(_) => !cursor_grabbed && !self.ui.no_widget_capturing_mouse(), WinEvent::Zoom(_) => !cursor_grabbed && !self.ui.no_widget_capturing_mouse(),
@ -645,17 +656,6 @@ impl Hud {
// Press key while not typing // Press key while not typing
WinEvent::InputUpdate(key, true) if !self.typing() => match key { WinEvent::InputUpdate(key, true) if !self.typing() => match key {
GameInput::ToggleInterface => {
self.show.toggle_ui();
true
}
GameInput::ToggleCursor => {
self.force_ungrab = !self.force_ungrab;
if self.force_ungrab {
global_state.window.grab_cursor(false);
}
true
}
GameInput::Map => { GameInput::Map => {
self.show.toggle_map(); self.show.toggle_map();
true true