From e93311fdc9e2372e262e5fb9f4cd496ec53f5798 Mon Sep 17 00:00:00 2001
From: David Zhao <nyquill@ppy.sh>
Date: Fri, 22 Mar 2019 19:01:32 +0900
Subject: [PATCH] DI facade

---
 .../Graphics/Containers/FacadeContainer.cs    | 30 +++++++++++++++++++
 osu.Game/Screens/Play/PlayerLoader.cs         | 14 ++++++---
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Graphics/Containers/FacadeContainer.cs

diff --git a/osu.Game/Graphics/Containers/FacadeContainer.cs b/osu.Game/Graphics/Containers/FacadeContainer.cs
new file mode 100644
index 0000000000..7d7a4b0680
--- /dev/null
+++ b/osu.Game/Graphics/Containers/FacadeContainer.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Screens.Menu;
+using osuTK;
+
+namespace osu.Game.Graphics.Containers
+{
+    public class FacadeContainer : Container
+    {
+        [Cached]
+        private Facade facade;
+
+        public FacadeContainer()
+        {
+            facade = new Facade();
+        }
+
+        public void SetLogo(OsuLogo logo)
+        {
+            facade.Size = new Vector2(logo.SizeForFlow);
+        }
+    }
+
+    public class Facade : Container
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index e9ee5d3fa8..878c2541e9 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -14,6 +14,7 @@ using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Menu;
@@ -32,7 +33,7 @@ namespace osu.Game.Screens.Play
 
         private Player player;
 
-        private Container content;
+        private FacadeContainer content;
 
         private BeatmapMetadataDisplay info;
 
@@ -59,7 +60,7 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = content = new Container
+            InternalChild = content = new FacadeContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -153,6 +154,8 @@ namespace osu.Game.Screens.Play
             logo.FadeIn(350);
 
             logo.Delay(resuming ? 0 : 500).MoveToOffset(new Vector2(0, -0.24f), 500, Easing.InOutExpo);
+
+            content.SetLogo(logo);
         }
 
         protected override void LoadComplete()
@@ -302,6 +305,8 @@ namespace osu.Game.Screens.Play
             private LoadingAnimation loading;
             private Sprite backgroundSprite;
             private ModDisplay modDisplay;
+            private FillFlowContainer fillFlowContainer;
+            private FacadeContainer facadeContainer;
 
             public bool Loading
             {
@@ -326,14 +331,14 @@ namespace osu.Game.Screens.Play
             }
 
             [BackgroundDependencyLoader]
-            private void load()
+            private void load(Facade facade)
             {
                 var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
 
                 AutoSizeAxes = Axes.Both;
                 Children = new Drawable[]
                 {
-                    new FillFlowContainer
+                    fillFlowContainer = new FillFlowContainer
                     {
                         AutoSizeAxes = Axes.Both,
                         Origin = Anchor.TopCentre,
@@ -341,6 +346,7 @@ namespace osu.Game.Screens.Play
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
+                            facade,
                             new OsuSpriteText
                             {
                                 Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),