From dac0148c94076026b579a8bc31fbba93bdd134c3 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 Feb 2020 20:08:14 +0100
Subject: [PATCH] Apply review suggestions.

---
 .../Online/TestSceneOnlineViewContainer.cs       |  2 +-
 osu.Game/Online/OnlineViewContainer.cs           | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 2b9609f6e0..9dac28d347 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             public new LoadingAnimation LoadingAnimation => base.LoadingAnimation;
 
-            public CompositeDrawable ViewTarget => base.Content.Parent;
+            public CompositeDrawable ViewTarget => base.Content;
 
             public TestOnlineViewContainer()
                 : base(@"Please sign in to view dummy test content")
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index c512ca531a..4b59f6ae80 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -21,8 +21,8 @@ namespace osu.Game.Online
 
         protected const double TRANSFORM_TIME = 300.0;
 
-        private readonly Container viewTarget;
-        protected override Container<Drawable> Content { get; }
+        private Container viewContent;
+        protected override Container<Drawable> Content => viewContent;
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
@@ -31,13 +31,9 @@ namespace osu.Game.Online
         {
             InternalChildren = new Drawable[]
             {
-                viewTarget = new Container
+                viewContent = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = Content = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    }
                 },
                 placeholder = new LoginPlaceholder(placeholderMessage),
                 LoadingAnimation = new LoadingAnimation
@@ -52,21 +48,21 @@ namespace osu.Game.Online
             switch (state)
             {
                 case APIState.Offline:
-                    PopContentOut(viewTarget);
+                    PopContentOut(viewContent);
                     placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * TRANSFORM_TIME, Easing.OutQuint);
                     placeholder.FadeInFromZero(2 * TRANSFORM_TIME, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Online:
-                    PopContentIn(viewTarget);
+                    PopContentIn(viewContent);
                     placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Failing:
                 case APIState.Connecting:
-                    PopContentOut(viewTarget);
+                    PopContentOut(viewContent);
                     LoadingAnimation.Show();
                     placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
                     break;