From b5a2f7003e0d0770c53c775a36a2a24a893be05a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Sep 2022 21:34:35 +0900
Subject: [PATCH] Disallow flinging when not in toast state

---
 osu.Game/Overlays/NotificationOverlay.cs        | 5 +++++
 osu.Game/Overlays/Notifications/Notification.cs | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index b170ea5dfa..708bd4874d 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -158,7 +158,10 @@ namespace osu.Game.Overlays
             playDebouncedSample(notification.PopInSampleName);
 
             if (State.Value == Visibility.Hidden)
+            {
+                notification.IsInTray = true;
                 toastTray.Post(notification);
+            }
             else
                 addPermanently(notification);
 
@@ -167,6 +170,8 @@ namespace osu.Game.Overlays
 
         private void addPermanently(Notification notification)
         {
+            notification.IsInTray = false;
+
             var ourType = notification.GetType();
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
 
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 3e7bd0ab2f..595cff4171 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -68,6 +68,11 @@ namespace osu.Game.Overlays.Notifications
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        /// <summary>
+        /// Whether this notification is in the <see cref="NotificationOverlayToastTray"/>.
+        /// </summary>
+        public bool IsInTray { get; set; }
+
         private readonly Box initialFlash;
 
         private Box background = null!;
@@ -262,7 +267,7 @@ namespace osu.Game.Overlays.Notifications
                 }
             }
 
-            protected override bool OnDragStart(DragStartEvent e) => true;
+            protected override bool OnDragStart(DragStartEvent e) => notification.IsInTray;
 
             protected override void OnDrag(DragEvent e)
             {
@@ -326,7 +331,7 @@ namespace osu.Game.Overlays.Notifications
 
             public bool FlingLeft()
             {
-                if (this.FindClosestParent<NotificationOverlayToastTray>() == null)
+                if (!notification.IsInTray)
                     return false;
 
                 if (flinging)