From cf239f4d9cbffa7d57f3b6b014fbfe822ca350ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 May 2017 19:03:21 +0900
Subject: [PATCH] Move chat into main content

Also changes the way parallax is applied to OsuScreens game-wide.
---
 osu.Game/OsuGame.cs           | 5 ++---
 osu.Game/Screens/OsuScreen.cs | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ccead95ede..a84333df8c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -160,7 +160,7 @@ namespace osu.Game
             });
 
             //overlay elements
-            LoadComponentAsync(chat = new ChatOverlay { Depth = 0 }, overlayContent.Add);
+            LoadComponentAsync(chat = new ChatOverlay { Depth = -1 }, mainContent.Add);
             LoadComponentAsync(options = new OptionsOverlay { Depth = -1 }, overlayContent.Add);
             LoadComponentAsync(musicController = new MusicController
             {
@@ -320,8 +320,7 @@ namespace osu.Game
         {
             base.UpdateAfterChildren();
 
-            if (intro?.ChildScreen != null)
-                intro.ChildScreen.Padding = new MarginPadding { Top = Toolbar.Position.Y + Toolbar.DrawHeight };
+            mainContent.Padding = new MarginPadding { Top = Toolbar.Position.Y + Toolbar.DrawHeight };
 
             Cursor.State = currentScreen?.HasLocalCursorDisplayed == false ? Visibility.Visible : Visibility.Hidden;
         }
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 0b3ecb4f5a..16bdd6132f 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -7,6 +7,7 @@ using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Graphics.Containers;
+using OpenTK;
 
 namespace osu.Game.Screens
 {
@@ -96,6 +97,9 @@ namespace osu.Game.Screens
             }
             else if (bg != null)
             {
+                // this makes up for the fact our padding changes when the global toolbar is visible.
+                bg.Scale = new Vector2(1.06f);
+
                 AddInternal(new ParallaxContainer
                 {
                     Depth = float.MaxValue,