From 4f7d0c8b5cd9a02696522535198348c87ed2be58 Mon Sep 17 00:00:00 2001 From: Enrico Marconi Date: Thu, 15 Oct 2020 13:28:29 +0200 Subject: [PATCH 1/2] Fix issue #790: hotbar working while ui is toggled off --- voxygen/src/hud/mod.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 8eaeafa482..3542eebb4d 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -2400,7 +2400,6 @@ impl Hud { self.force_ungrab = !self.force_ungrab; true }, - _ if !self.show.ui => false, WinEvent::Zoom(_) => !cursor_grabbed && !self.ui.no_widget_capturing_mouse(), WinEvent::InputUpdate(GameInput::Chat, true) => { @@ -2624,7 +2623,7 @@ impl Hud { if !self.show.ui { // Optimization: skip maintaining UI when it's off. - return vec![]; + return std::mem::replace(&mut self.events, Vec::new()); } if let Some(maybe_id) = self.to_focus.take() { From 14ec1b4d2a2b85c8809e0518520e2d20c9ce00fa Mon Sep 17 00:00:00 2001 From: Enrico Marconi Date: Thu, 15 Oct 2020 14:47:29 +0200 Subject: [PATCH 2/2] Suggested edit --- voxygen/src/hud/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 3542eebb4d..ba0819a45b 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -2623,7 +2623,7 @@ impl Hud { if !self.show.ui { // Optimization: skip maintaining UI when it's off. - return std::mem::replace(&mut self.events, Vec::new()); + return std::mem::take(&mut self.events); } if let Some(maybe_id) = self.to_focus.take() {