h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 08:55:35 +08:00
Code Issues Releases Wiki Activity

Update IsDisplayingToasts to check the flow count directly

Browse Source
This commit is contained in:
Dean Herbert 2022-09-06 17:30:24 +09:00
parent 9e3228aa65
commit 6e52dbb266
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ namespace osu.Game.Overlays
{ {
public override bool IsPresent => toastContentBackground.Height > 0 || toastFlow.Count > 0; public override bool IsPresent => toastContentBackground.Height > 0 || toastFlow.Count > 0;
public bool IsDisplayingToasts => allNotifications.Any(); public bool IsDisplayingToasts => toastFlow.Count > 0;
private FillFlowContainer<Notification> toastFlow = null!; private FillFlowContainer<Notification> toastFlow = null!;
private BufferedContainer toastContentBackground = null!; private BufferedContainer toastContentBackground = null!;
@ -36,9 +36,12 @@ namespace osu.Game.Overlays
public Action<Notification>? ForwardNotificationToPermanentStore { get; set; } public Action<Notification>? ForwardNotificationToPermanentStore { get; set; }
public int UnreadCount => allNotifications.Count(n => !n.WasClosed && !n.Read); public int UnreadCount => allDisplayedNotifications.Count(n => !n.WasClosed && !n.Read);
private IEnumerable<Notification> allNotifications => toastFlow.Concat(InternalChildren.OfType<Notification>()); /// <summary>
/// Notifications contained in the toast flow, or in a detached state while they animate during forwarding to the main overlay.
/// </summary>
private IEnumerable<Notification> allDisplayedNotifications => toastFlow.Concat(InternalChildren.OfType<Notification>());
private int runningDepth; private int runningDepth;