From 74fa1f8715ff30e87f7b10f9af827f9bfeee5703 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sat, 25 May 2019 20:16:38 +0100 Subject: [PATCH 1/2] Limited total messages Former-commit-id: 7c8e4a3f9e1d36731579300f7662a324566de6fb --- voxygen/src/hud/chat.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/voxygen/src/hud/chat.rs b/voxygen/src/hud/chat.rs index ef5efcfd91..40afe22e44 100644 --- a/voxygen/src/hud/chat.rs +++ b/voxygen/src/hud/chat.rs @@ -17,6 +17,8 @@ widget_ids! { } } +const MAX_MESSAGES: usize = 100; + #[derive(WidgetCommon)] pub struct Chat<'a> { new_messages: &'a mut VecDeque, @@ -91,6 +93,13 @@ impl<'a> Widget for Chat<'a> { ui.scroll_widget(state.ids.message_box, [0.0, std::f64::MAX]); } + // Empty old messages + state.update(|s| { + while s.messages.len() > MAX_MESSAGES { + s.messages.pop_back(); + } + }); + let keyboard_capturer = ui.global_input().current.widget_capturing_keyboard; let input_focused = keyboard_capturer == Some(state.ids.input); From 741cdaf7150855c39b7f3ad0cba26bdbaa0addb9 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sat, 25 May 2019 21:03:56 +0100 Subject: [PATCH 2/2] Switched to pop_front Former-commit-id: 2653d3bb0fc5e9dd9c50eeb7b012d3cd4e94b439 --- voxygen/src/hud/chat.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voxygen/src/hud/chat.rs b/voxygen/src/hud/chat.rs index 40afe22e44..eaca8fafdb 100644 --- a/voxygen/src/hud/chat.rs +++ b/voxygen/src/hud/chat.rs @@ -96,7 +96,7 @@ impl<'a> Widget for Chat<'a> { // Empty old messages state.update(|s| { while s.messages.len() > MAX_MESSAGES { - s.messages.pop_back(); + s.messages.pop_front(); } });