RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid reference counting by using height calculation for `IsPresent` instead 

The reference counting was to guarantee performance (zero allocations)
when the notification overlay was not required, but adds extra
complexity.

Instead, the toast tray now uses its ongoing height calculation as a
metric for presence.
This commit is contained in:
Dean Herbert 2022-09-05 19:35:15 +09:00
parent 0514c96191
commit 510972e3ad
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Overlays/NotificationOverlayToastTray.cs
View File

@ -24,9 +24,9 @@ namespace osu.Game.Overlays
/// </summary>
public class NotificationOverlayToastTray : CompositeDrawable
{
public override bool IsPresent => IsDisplayingToasts;
public override bool IsPresent => toastContentBackground.Height > 0 || toastFlow.Count > 0;
public bool IsDisplayingToasts => displayedCount > 0;
public bool IsDisplayingToasts => allNotifications.Any();
private FillFlowContainer<Notification> toastFlow = null!;
private BufferedContainer toastContentBackground = null!;
@ -42,8 +42,6 @@ public class NotificationOverlayToastTray : CompositeDrawable
private int runningDepth;
private int displayedCount;
[BackgroundDependencyLoader]
private void load()
{
@ -61,6 +59,7 @@ private void load()
colourProvider.Background6.Opacity(0.7f),
colourProvider.Background6.Opacity(0.5f)),
RelativeSizeAxes = Axes.Both,
Height = 0,
}.WithEffect(new BlurEffect
{
PadExtent = true,
@ -97,10 +96,7 @@ public void FlushAllToasts()
public void Post(Notification notification)
{
notification.Closed += stopTrackingNotification;
++runningDepth;
displayedCount++;
int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
@ -141,10 +137,6 @@ private void forwardNotification(Notification notification)
notification.MoveToOffset(new Vector2(400, 0), NotificationOverlay.TRANSITION_LENGTH, Easing.OutQuint);
notification.FadeOut(NotificationOverlay.TRANSITION_LENGTH, Easing.OutQuint).OnComplete(_ =>
{
notification.Closed -= stopTrackingNotification;
if (!notification.WasClosed)
stopTrackingNotification();
RemoveInternal(notification, false);
ForwardNotificationToPermanentStore?.Invoke(notification);
@ -152,17 +144,11 @@ private void forwardNotification(Notification notification)
});
}
private void stopTrackingNotification()
{
Debug.Assert(displayedCount > 0);
displayedCount--;
}
protected override void Update()
{
base.Update();
float height = toastFlow.DrawHeight + 120;
float height = toastFlow.Count > 0 ? toastFlow.DrawHeight + 120 : 0;
float alpha = toastFlow.Count > 0 ? MathHelper.Clamp(toastFlow.DrawHeight / 41, 0, 1) * toastFlow.Children.Max(n => n.Alpha) : 0;
toastContentBackground.Height = (float)Interpolation.DampContinuously(toastContentBackground.Height, height, 10, Clock.ElapsedFrameTime);