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

Redo settings -> help text, add supplement_events to Window.

Browse Source 
Former-commit-id: 2f341c1de302f5600436a3ded1c69af7c9b2c329
This commit is contained in:
Yeedo 2019-04-25 16:32:59 +01:00
parent c032e60d12
commit 0dbdb185d4
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
voxygen/src/window.rs
View File

@ -11,7 +11,6 @@ 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>,
}
@ -61,7 +60,6 @@ impl Window {
window,
cursor_grabbed: false,
needs_refresh_resize: false,
settings_changed: true,
key_map,
supplement_events: vec![],
});
@ -84,11 +82,6 @@ impl Window {
self.needs_refresh_resize = false;
}
if self.settings_changed {
events.push(Event::SettingsChanged);
self.settings_changed = false;
}
// 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;
@ -219,4 +212,4 @@ pub enum Event {
Ui(ui::Event),
/// Game settings have changed
SettingsChanged,
}
}