From 7b8211e6db51cd8b1d9a43f2172b55fd974c8a73 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 29 May 2018 04:23:29 -0300
Subject: [PATCH 1/2] Add MultiplayerScreen.Type

---
 osu.Game/Screens/Multi/Header.cs                    | 8 ++++----
 osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs     | 3 ++-
 osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs | 5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index de71b20007..fb4da45aca 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Multi
     {
         public const float HEIGHT = 121;
 
-        private readonly OsuSpriteText screenTitle;
+        private readonly OsuSpriteText screenType;
         private readonly HeaderBreadcrumbControl breadcrumbs;
 
         public Header(Screen initialScreen)
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Multi
                                             Text = "multiplayer ",
                                             TextSize = 25,
                                         },
-                                        screenTitle = new OsuSpriteText
+                                        screenType = new OsuSpriteText
                                         {
                                             TextSize = 25,
                                             Font = @"Exo2.0-Light",
@@ -86,14 +86,14 @@ namespace osu.Game.Screens.Multi
                 },
             };
 
-            breadcrumbs.Current.ValueChanged += s => screenTitle.Text = ((MultiplayerScreen)s).Title;
+            breadcrumbs.Current.ValueChanged += s => screenType.Text = ((MultiplayerScreen)s).Type;
             breadcrumbs.Current.TriggerChange();
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            screenTitle.Colour = colours.Yellow;
+            screenType.Colour = colours.Yellow;
             breadcrumbs.StripColour = colours.Green;
         }
 
diff --git a/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs b/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
index 60ffe2c0b9..f0c93b1146 100644
--- a/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
+++ b/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
@@ -25,7 +25,8 @@ namespace osu.Game.Screens.Multi.Screens.Lounge
         protected readonly FillFlowContainer<DrawableRoom> RoomsContainer;
         protected readonly RoomInspector Inspector;
 
-        public override string Title => "lounge";
+        public override string Type => "lounge";
+        public override string Title => "Lounge";
 
         protected override Container<Drawable> TransitionContent => content;
 
diff --git a/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs b/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs
index 191fe66037..cdfa17a7a6 100644
--- a/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs
+++ b/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs
@@ -15,6 +15,11 @@ namespace osu.Game.Screens.Multi.Screens
 
         protected virtual Container<Drawable> TransitionContent => Content;
 
+        /// <summary>
+        /// The type to display in the title of the <see cref="Header"/>.
+        /// </summary>
+        public abstract string Type { get; }
+
         protected override void OnEntering(Screen last)
         {
             base.OnEntering(last);

From ff93a54a64de5f81039f31f4faa7f08f2d0b432c Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Wed, 30 May 2018 23:16:54 -0300
Subject: [PATCH 2/2] Default Type to Title, use ToLower for the screen type
 title.

---
 osu.Game/Screens/Multi/Header.cs                    | 2 +-
 osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs     | 1 -
 osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index fb4da45aca..46610a36d8 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Multi
                 },
             };
 
-            breadcrumbs.Current.ValueChanged += s => screenType.Text = ((MultiplayerScreen)s).Type;
+            breadcrumbs.Current.ValueChanged += s => screenType.Text = ((MultiplayerScreen)s).Type.ToLower();
             breadcrumbs.Current.TriggerChange();
         }
 
diff --git a/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs b/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
index f0c93b1146..016babcaa5 100644
--- a/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
+++ b/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
@@ -25,7 +25,6 @@ namespace osu.Game.Screens.Multi.Screens.Lounge
         protected readonly FillFlowContainer<DrawableRoom> RoomsContainer;
         protected readonly RoomInspector Inspector;
 
-        public override string Type => "lounge";
         public override string Title => "Lounge";
 
         protected override Container<Drawable> TransitionContent => content;
diff --git a/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs b/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs
index cdfa17a7a6..fa9b40684c 100644
--- a/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs
+++ b/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Multi.Screens
         /// <summary>
         /// The type to display in the title of the <see cref="Header"/>.
         /// </summary>
-        public abstract string Type { get; }
+        public virtual string Type => Title;
 
         protected override void OnEntering(Screen last)
         {