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 'snowram/escape-trades' into 'master'

Browse Source 
Allow Escape key to cancel trades

See merge request veloren/veloren!1989
This commit is contained in:
Snowram 2021-03-25 01:39:43 +00:00
commit 027aca09c3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3127,6 +3127,8 @@ impl Hud {
WinEvent::InputUpdate(GameInput::Escape, true) => {
if self.typing() {
self.ui.focus_widget(None);
} else if self.show.trade {
self.events.push(Event::TradeAction(TradeAction::Decline));
} else {
// Close windows on esc
self.show.toggle_windows(global_state);