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

Closing a subwindow (such as inventory or the list of online players) only regrabs the cursor if no other subwindow requires it.

Browse Source 
Fixes #1116.
This commit is contained in:
Avi Weinstock 2022-07-17 14:55:22 -04:00
parent c85819f03c
commit 7f6ba8e492
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -84,6 +84,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- All sounds now stop upon quitting to main menu - All sounds now stop upon quitting to main menu
- Combat music now loops and ends properly - Combat music now loops and ends properly
- Modular weapons now have a selling price - Modular weapons now have a selling price
- Closing a subwindow now only regrabs the cursor if no other subwindow requires it.
## [0.12.0] - 2022-02-19 ## [0.12.0] - 2022-02-19

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

@ -726,7 +726,7 @@ impl Show {
if !self.esc_menu { if !self.esc_menu {
self.bag = open; self.bag = open;
self.map = false; self.map = false;
self.want_grab = !open; self.want_grab = !self.any_window_requires_cursor();
self.crafting_fields.salvage = false; self.crafting_fields.salvage = false;
if !open { if !open {
@ -740,7 +740,7 @@ impl Show {
self.bag = open; self.bag = open;
self.trade = open; self.trade = open;
self.map = false; self.map = false;
self.want_grab = !open; self.want_grab = !self.any_window_requires_cursor();
} }
} }
@ -752,7 +752,7 @@ impl Show {
self.crafting_fields.salvage = false; self.crafting_fields.salvage = false;
self.social = false; self.social = false;
self.diary = false; self.diary = false;
self.want_grab = !open; self.want_grab = !self.any_window_requires_cursor();
} }
} }
@ -764,7 +764,7 @@ impl Show {
} }
self.social = open; self.social = open;
self.diary = false; self.diary = false;
self.want_grab = !open; self.want_grab = !self.any_window_requires_cursor();
} }
} }
@ -779,7 +779,7 @@ impl Show {
self.crafting_fields.recipe_inputs = HashMap::new(); self.crafting_fields.recipe_inputs = HashMap::new();
self.bag = open; self.bag = open;
self.map = false; self.map = false;
self.want_grab = !open; self.want_grab = !self.any_window_requires_cursor();
} }
} }
@ -806,7 +806,7 @@ impl Show {
self.map = false; self.map = false;
self.diary_fields = diary::DiaryShow::default(); self.diary_fields = diary::DiaryShow::default();
self.diary = open; self.diary = open;
self.want_grab = !open; self.want_grab = !self.any_window_requires_cursor();
} }
} }
@ -822,7 +822,7 @@ impl Show {
self.crafting = false; self.crafting = false;
self.crafting_fields.salvage = false; self.crafting_fields.salvage = false;
self.diary = false; self.diary = false;
self.want_grab = !open; self.want_grab = !self.any_window_requires_cursor();
} }
} }
@ -860,8 +860,8 @@ impl Show {
// TODO: Add self updating key-bindings element // TODO: Add self updating key-bindings element
//fn toggle_help(&mut self) { self.help = !self.help } //fn toggle_help(&mut self) { self.help = !self.help }
fn toggle_windows(&mut self, global_state: &mut GlobalState) { fn any_window_requires_cursor(&self) -> bool {
if self.bag self.bag
|| self.trade || self.trade
|| self.esc_menu || self.esc_menu
|| self.map || self.map
@ -871,7 +871,10 @@ impl Show {
|| self.help || self.help
|| self.intro || self.intro
|| !matches!(self.open_windows, Windows::None) || !matches!(self.open_windows, Windows::None)
{ }
fn toggle_windows(&mut self, global_state: &mut GlobalState) {
if self.any_window_requires_cursor() {
self.bag = false; self.bag = false;
self.trade = false; self.trade = false;
self.esc_menu = false; self.esc_menu = false;