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

Merge branch 'show-mouse-esc' into 'master'

Browse Source 
Show mouse on Esc, hide when pressing again

Closes #28

See merge request veloren/veloren!61

Former-commit-id: 37d5792a563f4cce2f2c9f13d3d46cf098caf27f
This commit is contained in:
Forest Anderson 2019-04-25 18:27:08 +00:00
commit cabb06717b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1666,7 +1666,7 @@ impl Hud {
self.show_ui = !self.show_ui;
}
fn toggle_windows(&mut self) {
fn toggle_windows(&mut self, global_state: &mut GlobalState) {
if self.bag_open
|| self.menu_open
|| self.map_open
@ -1679,8 +1679,10 @@ impl Hud {
self.menu_open = false;
self.map_open = false;
self.open_windows = Windows::None;
global_state.window.grab_cursor(true);
} else {
self.menu_open = true;
global_state.window.grab_cursor(false);
}
}
@ -1721,7 +1723,7 @@ impl Hud {
self.ui.focus_widget(None);
} else {
// Close windows on esc
self.toggle_windows();
self.toggle_windows(global_state);
}
true
}