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

Update help window to use player's keybindings (fix #42)

Browse Source 
Former-commit-id: b5bc8a8801fd4633ec94ea53a8973bcb891a4fd6
This commit is contained in:
Yeedo 2019-04-25 14:10:01 +01:00
parent ad1fc20cfe
commit dc5ec137e9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
voxygen/src/window.rs
View File

@ -11,6 +11,7 @@ pub struct Window {
window: glutin::GlWindow,
cursor_grabbed: bool,
needs_refresh_resize: bool,
settings_changed: bool,
key_map: HashMap<glutin::VirtualKeyCode, Key>,
supplement_events: Vec<Event>,
}
@ -60,6 +61,7 @@ impl Window {
window,
cursor_grabbed: false,
needs_refresh_resize: false,
settings_changed: true,
key_map,
supplement_events: vec![],
});
@ -82,6 +84,10 @@ impl Window {
self.needs_refresh_resize = false;
}
if self.settings_changed {
events.push(Event::SettingsChanged);
}
// Copy data that is needed by the events closure to avoid lifetime errors
// TODO: Remove this if/when the compiler permits it
let cursor_grabbed = self.cursor_grabbed;
@ -212,4 +218,4 @@ pub enum Event {
Ui(ui::Event),
/// Game settings have changed
SettingsChanged,
}
}