From 4e1cf329c88628cfaa537dd81c420c3350534e6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Aug 2017 17:39:39 +0900
Subject: [PATCH] Move background logic to base class; reduce overdraw after
 set fades in

---
 osu.Game/Overlays/Direct/DirectGridPanel.cs | 10 ++-------
 osu.Game/Overlays/Direct/DirectPanel.cs     | 25 ++++++++++++++++++++-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Direct/DirectGridPanel.cs b/osu.Game/Overlays/Direct/DirectGridPanel.cs
index 822edd02df..5b648633c1 100644
--- a/osu.Game/Overlays/Direct/DirectGridPanel.cs
+++ b/osu.Game/Overlays/Direct/DirectGridPanel.cs
@@ -39,14 +39,8 @@ namespace osu.Game.Overlays.Direct
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, LocalisationEngine localisation)
         {
-            Children = new[]
+            AddRange(new Drawable[]
             {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black,
-                },
-                CreateBackground(),
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -174,7 +168,7 @@ namespace osu.Game.Overlays.Direct
                         new Statistic(FontAwesome.fa_heart, SetInfo.OnlineInfo?.FavouriteCount ?? 0),
                     },
                 },
-            };
+            });
         }
     }
 }
diff --git a/osu.Game/Overlays/Direct/DirectPanel.cs b/osu.Game/Overlays/Direct/DirectPanel.cs
index 9395e6817d..a56c15b532 100644
--- a/osu.Game/Overlays/Direct/DirectPanel.cs
+++ b/osu.Game/Overlays/Direct/DirectPanel.cs
@@ -2,10 +2,12 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
@@ -19,6 +21,8 @@ namespace osu.Game.Overlays.Direct
     {
         protected readonly BeatmapSetInfo SetInfo;
 
+        protected Box BlackBackground;
+
         protected DirectPanel(BeatmapSetInfo setInfo)
         {
             SetInfo = setInfo;
@@ -33,6 +37,21 @@ namespace osu.Game.Overlays.Direct
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRange(new[]
+            {
+                // temporary blackness until the actual background loads.
+                BlackBackground = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                CreateBackground(),
+            });
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -55,7 +74,11 @@ namespace osu.Game.Overlays.Direct
             Origin = Anchor.Centre,
             RelativeSizeAxes = Axes.Both,
             FillMode = FillMode.Fill,
-            OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
+            OnLoadComplete = d =>
+            {
+                d.FadeInFromZero(400, Easing.Out);
+                BlackBackground.Delay(400).FadeOut();
+            },
         })
         {
             RelativeSizeAxes = Axes.Both,