From 1c0b76945143bb40f39bda8ccfa0968f5cb86d53 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 12 Oct 2016 15:25:07 +0900 Subject: [PATCH] Centralise the maximum chat history variable. --- osu.Game/Online/Chat/Channel.cs | 10 ++++------ osu.Game/Online/Chat/Display/ChannelDisplay.cs | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/osu.Game/Online/Chat/Channel.cs b/osu.Game/Online/Chat/Channel.cs index 59d0cd8cc1..92e93d4a08 100644 --- a/osu.Game/Online/Chat/Channel.cs +++ b/osu.Game/Online/Chat/Channel.cs @@ -30,6 +30,8 @@ namespace osu.Game.Online.Chat //internal bool Joined; + public const int MAX_HISTORY = 100; + [JsonConstructor] public Channel() { @@ -47,13 +49,9 @@ namespace osu.Game.Online.Chat private void purgeOldMessages() { - const int max_history = 50; - int messageCount = Messages.Count; - if (messageCount > 50) - { - Messages.RemoveRange(0, messageCount - max_history); - } + if (messageCount > MAX_HISTORY) + Messages.RemoveRange(0, messageCount - MAX_HISTORY); } } } diff --git a/osu.Game/Online/Chat/Display/ChannelDisplay.cs b/osu.Game/Online/Chat/Display/ChannelDisplay.cs index ad7db24a55..4c6bc4af80 100644 --- a/osu.Game/Online/Chat/Display/ChannelDisplay.cs +++ b/osu.Game/Online/Chat/Display/ChannelDisplay.cs @@ -67,13 +67,13 @@ namespace osu.Game.Online.Chat.Display { if (!IsLoaded) return; - var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - 20)); + var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MAX_HISTORY)); - //up to last 20 messages + //up to last Channel.MAX_HISTORY messages foreach (Message m in displayMessages) flow.Add(new ChatLine(m)); - while (flow.Children.Count() > 20) + while (flow.Children.Count() > Channel.MAX_HISTORY) flow.Remove(flow.Children.First()); } }