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

Define and measure duration for text notifications in milliseconds

Browse Source 
During a game notification duration should be the same regardless of
game speed. Switch to using wall-clock time defined in milliseconds 
instead of game ticks. Also use the opportunity to rename the field 
to "Duration" because "RemoveTime" is not so clear.
This commit is contained in:
Ivaylo Draganov
2022-12-13 11:49:58 +02:00
committed by abcdefg30
parent e280e0f31c
commit 614603089e
7 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Widgets/TextNotificationsDisplayWidget.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Widgets
{
public class TextNotificationsDisplayWidget : Widget
{
public readonly int RemoveTime = 0;
public readonly int DisplayDurationMs = 0;
public readonly int ItemSpacing = 4;
public readonly int BottomSpacing = 0;
public readonly int LogLength = 8;
@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Widgets
public string TransientsTemplate = "TRANSIENT_LINE_TEMPLATE";
readonly Dictionary<TextNotificationPool, Widget> templates = new Dictionary<TextNotificationPool, Widget>();
readonly List<int> expirations = new List<int>();
readonly List<long> expirations = new List<long>();
Rectangle overflowDrawBounds = Rectangle.Empty;
public override Rectangle EventBounds => Rectangle.Empty;
@@ -96,7 +96,7 @@ namespace OpenRA.Mods.Common.Widgets
}
AddChild(notificationWidget);
expirations.Add(Game.LocalTick + RemoveTime);
expirations.Add(Game.RunTime + DisplayDurationMs);
while (Children.Count > LogLength)
RemoveNotification();
@@ -127,11 +127,11 @@ namespace OpenRA.Mods.Common.Widgets
public override void Tick()
{
if (RemoveTime == 0)
if (DisplayDurationMs == 0)
return;
// This takes advantage of the fact that recentLines is ordered by expiration, from sooner to later
while (Children.Count > 0 && Game.LocalTick >= expirations[0])
while (Children.Count > 0 && Game.RunTime >= expirations[0])
RemoveNotification();
}
}