epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a transients panel with corresponding chrome logic and a notification template

Browse Source
This commit is contained in:
Ivaylo Draganov
2021-06-16 19:06:15 +03:00
committed by Matthias Mailänder
parent 9e92340ea7
commit 01d47566cc
20 changed files with 155 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs
View File

@@ -40,8 +40,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly string chatLineSound = ChromeMetrics.Get<string>("ChatLineSound");
TextNotification lastLine;
int repetitions;
bool chatEnabled;
readonly bool isMenuChat;
@@ -211,8 +209,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
chatScrollPanel.RemoveChildren();
chatScrollPanel.ScrollToBottom();
foreach (var chatLine in orderManager.NotificationsCache)
AddChatLine(chatLine, true);
foreach (var notification in orderManager.NotificationsCache)
if (IsNotificationEligible(notification))
AddNotification(notification, true);
orderManager.AddTextNotification += AddNotificationWrapper;
@@ -261,36 +260,19 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Ui.ResetTooltips();
}
public void AddNotificationWrapper(TextNotification chatLine)
public void AddNotificationWrapper(TextNotification notification)
{
var chatLineToDisplay = chatLine;
if (!IsNotificationEligible(notification))
return;
if (chatLine.CanIncrementOnDuplicate() && chatLine.Equals(lastLine))
{
repetitions++;
chatLineToDisplay = new TextNotification(
chatLine.Pool,
chatLine.Prefix,
$"{chatLine.Text} ({repetitions + 1})",
chatLine.PrefixColor,
chatLine.TextColor);
chatScrollPanel.RemoveChild(chatScrollPanel.Children[chatScrollPanel.Children.Count - 1]);
chatOverlayDisplay?.RemoveMostRecentNotification();
}
else
repetitions = 0;
lastLine = chatLine;
chatOverlayDisplay?.AddNotification(chatLineToDisplay);
chatOverlayDisplay?.AddNotification(notification);
// HACK: Force disable the chat notification sound for the in-menu chat dialog
// This works around our inability to disable the sounds for the in-game dialog when it is hidden
AddChatLine(chatLineToDisplay, chatOverlay == null);
AddNotification(notification, chatOverlay == null);
}
void AddChatLine(TextNotification notification, bool suppressSound)
void AddNotification(TextNotification notification, bool suppressSound)
{
var chatLine = templates[notification.Pool].Clone();
WidgetUtils.SetupTextNotification(chatLine, notification, chatScrollPanel.Bounds.Width - chatScrollPanel.ScrollbarWidth, isMenuChat && !world.IsReplay);
@@ -325,6 +307,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
}
static bool IsNotificationEligible(TextNotification notification)
{
return notification.Pool == TextNotificationPool.Chat ||
notification.Pool == TextNotificationPool.System ||
notification.Pool == TextNotificationPool.Mission;
}
bool disposed = false;
protected override void Dispose(bool disposing)
{