From 9e25e02696de1d38735abb8590ff6ef72e34d1f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jun 2018 15:49:58 +0900
Subject: [PATCH] Ensure notifications don't appear during UserTriggered mode

Closes #2640.
---
 osu.Game/OsuGame.cs                      |  2 -
 osu.Game/Overlays/NotificationOverlay.cs | 49 +++++++++++-------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5c256ed5c8..68c50dafab 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -366,8 +366,6 @@ namespace osu.Game
 
             settings.StateChanged += _ => updateScreenOffset();
             notifications.StateChanged += _ => updateScreenOffset();
-
-            AllowOverlays.ValueChanged += state => notifications.Enabled.Value = state == OverlayActivation.All;
         }
 
         public void CloseAllOverlays()
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 09b6022ac5..3dc8f5ec15 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -22,11 +22,6 @@ namespace osu.Game.Overlays
 
         public const float TRANSITION_LENGTH = 600;
 
-        /// <summary>
-        /// Whether posted notifications should be processed.
-        /// </summary>
-        public readonly BindableBool Enabled = new BindableBool(true);
-
         private FlowContainer<NotificationSection> sections;
 
         /// <summary>
@@ -34,27 +29,6 @@ namespace osu.Game.Overlays
         /// </summary>
         public Func<float> GetToolbarHeight;
 
-        public NotificationOverlay()
-        {
-            ScheduledDelegate notificationsEnabler = null;
-            Enabled.ValueChanged += v =>
-            {
-                if (!IsLoaded)
-                {
-                    processingPosts = v;
-                    return;
-                }
-
-                notificationsEnabler?.Cancel();
-
-                if (v)
-                    // we want a slight delay before toggling notifications on to avoid the user becoming overwhelmed.
-                    notificationsEnabler = Scheduler.AddDelayed(() => processingPosts = true, 1000);
-                else
-                    processingPosts = false;
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -103,6 +77,29 @@ namespace osu.Game.Overlays
             };
         }
 
+        private ScheduledDelegate notificationsEnabler;
+        private void updateProcessingMode()
+        {
+            bool enabled = OverlayActivationMode == OverlayActivation.All || State == Visibility.Visible;
+
+            notificationsEnabler?.Cancel();
+
+            if (enabled)
+                // we want a slight delay before toggling notifications on to avoid the user becoming overwhelmed.
+                notificationsEnabler = Scheduler.AddDelayed(() => processingPosts = true, State == Visibility.Visible ? 0 : 1000);
+            else
+                processingPosts = false;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            StateChanged += _ => updateProcessingMode();
+            OverlayActivationMode.ValueChanged += _ => updateProcessingMode();
+            OverlayActivationMode.TriggerChange();
+        }
+
         private int totalCount => sections.Select(c => c.DisplayedCount).Sum();
         private int unreadCount => sections.Select(c => c.UnreadCount).Sum();