h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:07:38 +08:00
Code Issues Releases Wiki Activity

Rename chat to channel

Browse Source
This commit is contained in:
miterosan 2018-07-09 18:30:41 +02:00
parent 709d134f49
commit 5e95995429
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -15,15 +15,15 @@ using osu.Game.Online.Chat;
namespace osu.Game.Overlays.Chat
{
public class DrawableChat : Container
public class DrawableChannel : Container
{
public readonly Channel Chat;
public readonly Channel Channel;
private readonly ChatLineContainer flow;
private readonly ScrollContainer scroll;
public DrawableChat(Channel chat)
public DrawableChannel(Channel channel)
{
Chat = chat;
Channel = channel;
RelativeSizeAxes = Axes.Both;
@ -50,15 +50,15 @@ namespace osu.Game.Overlays.Chat
}
};
Chat.NewMessagesArrived += newMessagesArrived;
Chat.MessageRemoved += messageRemoved;
Chat.PendingMessageResolved += pendingMessageResolved;
Channel.NewMessagesArrived += newMessagesArrived;
Channel.MessageRemoved += messageRemoved;
Channel.PendingMessageResolved += pendingMessageResolved;
}
[BackgroundDependencyLoader]
private void load()
{
newMessagesArrived(Chat.Messages);
newMessagesArrived(Channel.Messages);
}
protected override void LoadComplete()
@ -71,14 +71,14 @@ namespace osu.Game.Overlays.Chat
{
base.Dispose(isDisposing);
Chat.NewMessagesArrived -= newMessagesArrived;
Chat.MessageRemoved -= messageRemoved;
Chat.PendingMessageResolved -= pendingMessageResolved;
Channel.NewMessagesArrived -= newMessagesArrived;
Channel.MessageRemoved -= messageRemoved;
Channel.PendingMessageResolved -= pendingMessageResolved;
}
private void newMessagesArrived(IEnumerable<Message> newMessages)
{
// Add up to last ChatBase.MAX_HISTORY messages
// Add up to last Channel.MAX_HISTORY messages
var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MAX_HISTORY));
flow.AddRange(displayMessages.Select(m => new ChatLine(m)));

4
osu.Game/Overlays/ChatOverlay.cs
View File

@ -212,7 +212,7 @@ namespace osu.Game.Overlays
foreach (Channel removedChannel in args.OldItems)
{
chatTabControl.RemoveItem(removedChannel);
loadedChannels.Remove(loadedChannels.Find(c => c.Chat == removedChannel ));
loadedChannels.Remove(loadedChannels.Find(c => c.Channel == removedChannel ));
removedChannel.Joined.Value = false;
}
break;
@ -234,7 +234,7 @@ namespace osu.Game.Overlays
if (chatTabControl.Current.Value != chat)
Scheduler.Add(() => chatTabControl.Current.Value = chat);
var loaded = loadedChannels.Find(d => d.Chat == chat);
var loaded = loadedChannels.Find(d => d.Channel == chat);
if (loaded == null)
{
currentChatContainer.FadeOut(500, Easing.OutQuint);