mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Redo settings -> help text, add supplement_events
to Window
.
Former-commit-id: 5b29776d3f37fbf87842bc61c8d287fe8e66b691
This commit is contained in:
@ -11,7 +11,6 @@ pub struct Window {
|
|||||||
window: glutin::GlWindow,
|
window: glutin::GlWindow,
|
||||||
cursor_grabbed: bool,
|
cursor_grabbed: bool,
|
||||||
needs_refresh_resize: bool,
|
needs_refresh_resize: bool,
|
||||||
settings_changed: bool,
|
|
||||||
key_map: HashMap<glutin::VirtualKeyCode, Key>,
|
key_map: HashMap<glutin::VirtualKeyCode, Key>,
|
||||||
supplement_events: Vec<Event>,
|
supplement_events: Vec<Event>,
|
||||||
}
|
}
|
||||||
@ -61,7 +60,6 @@ impl Window {
|
|||||||
window,
|
window,
|
||||||
cursor_grabbed: false,
|
cursor_grabbed: false,
|
||||||
needs_refresh_resize: false,
|
needs_refresh_resize: false,
|
||||||
settings_changed: true,
|
|
||||||
key_map,
|
key_map,
|
||||||
supplement_events: vec![],
|
supplement_events: vec![],
|
||||||
});
|
});
|
||||||
@ -84,11 +82,6 @@ impl Window {
|
|||||||
self.needs_refresh_resize = false;
|
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
|
// Copy data that is needed by the events closure to avoid lifetime errors
|
||||||
// TODO: Remove this if/when the compiler permits it
|
// TODO: Remove this if/when the compiler permits it
|
||||||
let cursor_grabbed = self.cursor_grabbed;
|
let cursor_grabbed = self.cursor_grabbed;
|
||||||
|
Reference in New Issue
Block a user