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

Revert newMessagesArrived changes and always schedule highlight

Browse Source 
In the case a message arrives and the chat overlay is hidden, clicking
on the mention notification will not work as the `HighlightedMessage`
bindable callback will execute before the scheduled `newMessagesArrived`
logic (which was hanging since the message arrived until the chat
overlay became open because of the notification).

Simplify things by always scheduling the `HighlightedMessage` bindable
callback.
This commit is contained in:
Salman Ahmed 2022-03-08 04:43:40 +03:00
parent 512536f5fe
commit 2d8983383a
1 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,33 +74,37 @@ namespace osu.Game.Overlays.Chat
} }
}, },
}; };
newMessagesArrived(Channel.Messages);
Channel.NewMessagesArrived += newMessagesArrived;
Channel.MessageRemoved += messageRemoved;
Channel.PendingMessageResolved += pendingMessageResolved;
} }
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
addChatLines(Channel.Messages);
Channel.NewMessagesArrived += newMessagesArrived;
Channel.MessageRemoved += messageRemoved;
Channel.PendingMessageResolved += pendingMessageResolved;
highlightedMessage = Channel.HighlightedMessage.GetBoundCopy(); highlightedMessage = Channel.HighlightedMessage.GetBoundCopy();
highlightedMessage.BindValueChanged(m => highlightedMessage.BindValueChanged(m =>
{ {
if (m.NewValue == null) if (m.NewValue == null)
return; return;
var chatLine = chatLines.SingleOrDefault(c => c.Message.Equals(m.NewValue)); // schedule highlight to ensure it performs after any pending "newMessagesArrived" calls.
Schedule(() =>
if (chatLine != null)
{ {
scroll.ScrollIntoView(chatLine); var chatLine = chatLines.SingleOrDefault(c => c.Message.Equals(m.NewValue));
chatLine.ScheduleHighlight();
}
highlightedMessage.Value = null; if (chatLine != null)
{
scroll.ScrollIntoView(chatLine);
chatLine.ScheduleHighlight();
}
highlightedMessage.Value = null;
});
}, true); }, true);
} }
@ -121,39 +125,18 @@ namespace osu.Game.Overlays.Chat
Colour = colours.ChatBlue.Lighten(0.7f), Colour = colours.ChatBlue.Lighten(0.7f),
}; };
private void newMessagesArrived(IEnumerable<Message> newMessages) => Schedule(addChatLines, newMessages); private void newMessagesArrived(IEnumerable<Message> newMessages) => Schedule(() =>
private void pendingMessageResolved(Message existing, Message updated) => Schedule(() =>
{ {
var found = chatLines.LastOrDefault(c => c.Message == existing); if (newMessages.Min(m => m.Id) < chatLines.Max(c => c.Message.Id))
if (found != null)
{
Trace.Assert(updated.Id.HasValue, "An updated message was returned with no ID.");
ChatLineFlow.Remove(found);
found.Message = updated;
ChatLineFlow.Add(found);
}
});
private void messageRemoved(Message removed) => Schedule(() =>
{
chatLines.FirstOrDefault(c => c.Message == removed)?.FadeColour(Color4.Red, 400).FadeOut(600).Expire();
});
private void addChatLines(IEnumerable<Message> messages)
{
if (messages.Min(m => m.Id) < chatLines.Max(c => c.Message.Id))
{ {
// there is a case (on initial population) that we may receive past messages and need to reorder. // there is a case (on initial population) that we may receive past messages and need to reorder.
// easiest way is to just combine messages and recreate drawables (less worrying about day separators etc.) // easiest way is to just combine messages and recreate drawables (less worrying about day separators etc.)
messages = messages.Concat(chatLines.Select(c => c.Message)).OrderBy(m => m.Id).ToList(); newMessages = newMessages.Concat(chatLines.Select(c => c.Message)).OrderBy(m => m.Id).ToList();
ChatLineFlow.Clear(); ChatLineFlow.Clear();
} }
// Add up to last Channel.MAX_HISTORY messages // Add up to last Channel.MAX_HISTORY messages
var displayMessages = messages.Skip(Math.Max(0, messages.Count() - Channel.MAX_HISTORY)); var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MAX_HISTORY));
Message lastMessage = chatLines.LastOrDefault()?.Message; Message lastMessage = chatLines.LastOrDefault()?.Message;
@ -192,9 +175,28 @@ namespace osu.Game.Overlays.Chat
// due to the scroll adjusts from old messages removal above, a scroll-to-end must be enforced, // due to the scroll adjusts from old messages removal above, a scroll-to-end must be enforced,
// to avoid making the container think the user has scrolled back up and unwantedly disable auto-scrolling. // to avoid making the container think the user has scrolled back up and unwantedly disable auto-scrolling.
if (messages.Any(m => m is LocalMessage)) if (newMessages.Any(m => m is LocalMessage))
scroll.ScrollToEnd(); scroll.ScrollToEnd();
} });
private void pendingMessageResolved(Message existing, Message updated) => Schedule(() =>
{
var found = chatLines.LastOrDefault(c => c.Message == existing);
if (found != null)
{
Trace.Assert(updated.Id.HasValue, "An updated message was returned with no ID.");
ChatLineFlow.Remove(found);
found.Message = updated;
ChatLineFlow.Add(found);
}
});
private void messageRemoved(Message removed) => Schedule(() =>
{
chatLines.FirstOrDefault(c => c.Message == removed)?.FadeColour(Color4.Red, 400).FadeOut(600).Expire();
});
private IEnumerable<ChatLine> chatLines => ChatLineFlow.Children.OfType<ChatLine>(); private IEnumerable<ChatLine> chatLines => ChatLineFlow.Children.OfType<ChatLine>();