From fcab21908bd02a73effc030849e9df6f75ad8dbe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 Feb 2019 18:20:03 +0900
Subject: [PATCH] Update in line with screen changes

---
 osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs | 9 +--------
 osu.Game.Tournament/Screens/TournamentScreen.cs        | 9 +++++++--
 osu.Game.Tournament/TournamentGame.cs                  | 3 ++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index 66e539af25..f68adabb4c 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -13,11 +13,9 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Screens.Drawings.Components;
 using osuTK;
@@ -25,14 +23,10 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Drawings
 {
-    public class DrawingsScreen : OsuScreen
+    public class DrawingsScreen : CompositeDrawable
     {
         private const string results_filename = "drawings_results.txt";
 
-        public override bool HideOverlaysOnEnter => true;
-
-        protected override BackgroundScreen CreateBackground() => null;
-
         private ScrollingTeamContainer teamsContainer;
         private GroupContainer groupsContainer;
         private OsuSpriteText fullTeamNameText;
@@ -59,7 +53,6 @@ namespace osu.Game.Tournament.Screens.Drawings
 
             if (!TeamList.Teams.Any())
             {
-                this.Exit();
                 return;
             }
 
diff --git a/osu.Game.Tournament/Screens/TournamentScreen.cs b/osu.Game.Tournament/Screens/TournamentScreen.cs
index b440b8e796..e830509db9 100644
--- a/osu.Game.Tournament/Screens/TournamentScreen.cs
+++ b/osu.Game.Tournament/Screens/TournamentScreen.cs
@@ -3,15 +3,20 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Screens;
+using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Tournament.Screens
 {
-    public class TournamentScreen : OsuScreen
+    public class TournamentScreen : CompositeDrawable
     {
         [Resolved]
         protected LadderInfo LadderInfo { get; private set; }
 
+        public TournamentScreen()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
         public override void Hide()
         {
             this.FadeOut(200);
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index f970700fc5..711ecc5ae9 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;
+using osu.Framework.Screens;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Tournament.Screens;
 
@@ -16,7 +17,7 @@ namespace osu.Game.Tournament
             Add(new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = new TournamentSceneManager()
+                Child = new ScreenStack(new TournamentSceneManager()) { RelativeSizeAxes = Axes.Both }
             });
 
             MenuCursorContainer.Cursor.Alpha = 0;