Add mods to the match info

osu.Game/Screens/Multi/Match/Components/Info.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Extensions;
@@ -14,14 +15,16 @@
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays.SearchableList;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
     public class Info : Container
     {
-        public const float HEIGHT = 128;
+        public const float HEIGHT = 156;
 
         private readonly OsuSpriteText availabilityStatus;
         private readonly ReadyButton readyButton;
@@ -35,6 +38,7 @@ public class Info : Container
         public readonly Bindable<RoomStatus> Status = new Bindable<RoomStatus>();
         public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
         public readonly Bindable<GameType> Type = new Bindable<GameType>();
+        public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>();
 
         public Info()
         {
@@ -43,6 +47,7 @@ public Info()
 
             BeatmapTypeInfo beatmapTypeInfo;
             OsuSpriteText name;
+            ModDisplay modDisplay;
 
             Children = new Drawable[]
             {
@@ -74,11 +79,23 @@ public Info()
                                         availabilityStatus = new OsuSpriteText { TextSize = 14 },
                                     },
                                 },
-                                beatmapTypeInfo = new BeatmapTypeInfo
+                                new FillFlowContainer
                                 {
                                     Anchor = Anchor.BottomLeft,
                                     Origin = Anchor.BottomLeft,
-                                },
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Vertical,
+                                    Children = new Drawable[]
+                                    {
+                                        beatmapTypeInfo = new BeatmapTypeInfo(),
+                                        modDisplay = new ModDisplay
+                                        {
+                                            Scale = new Vector2(0.75f),
+                                            DisplayUnrankedText = false
+                                        },
+                                    }
+                                }
+
                             },
                         },
                         readyButton = new ReadyButton
@@ -95,6 +112,7 @@ public Info()
 
             beatmapTypeInfo.Beatmap.BindTo(Beatmap);
             beatmapTypeInfo.Type.BindTo(Type);
+            modDisplay.Current.BindTo(Mods);
 
             Availability.BindValueChanged(_ => updateAvailabilityStatus());
             Status.BindValueChanged(_ => updateAvailabilityStatus());

osu.Game/Screens/Multi/Match/MatchScreen.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
@@ -9,6 +10,7 @@
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
@@ -33,6 +35,9 @@ public class MatchScreen : MultiplayerScreen
 
         public override string ShortTitle => "room";
 
+        [Cached]
+        private readonly Bindable<IEnumerable<Mod>> mods = new Bindable<IEnumerable<Mod>>(Enumerable.Empty<Mod>());
+
         [Cached]
         private readonly Room room;
 
@@ -101,6 +106,7 @@ public MatchScreen(Room room)
             info.Status.BindTo(statusBind);
             info.Availability.BindTo(availabilityBind);
             info.Type.BindTo(typeBind);
+            info.Mods.BindTo(mods);
 
             participants.Users.BindTo(participantsBind);
             participants.MaxParticipants.BindTo(maxParticipantsBind);

osu.Game/Screens/Play/HUD/ModDisplay.cs

@@ -20,6 +20,8 @@ public class ModDisplay : Container, IHasCurrentValue<IEnumerable<Mod>>
     {
         private const int fade_duration = 1000;
 
+        public bool DisplayUnrankedText = true;
+
         private readonly Bindable<IEnumerable<Mod>> mods = new Bindable<IEnumerable<Mod>>();
 
         public Bindable<IEnumerable<Mod>> Current => mods;
@@ -29,6 +31,8 @@ public class ModDisplay : Container, IHasCurrentValue<IEnumerable<Mod>>
 
         public ModDisplay()
         {
+            AutoSizeAxes = Axes.Both;
+
             Children = new Drawable[]
             {
                 iconsContainer = new ReverseChildIDFillFlowContainer<ModIcon>
@@ -41,7 +45,6 @@ public ModDisplay()
                 },
                 unrankedText = new OsuSpriteText
                 {
-                    AlwaysPresent = true,
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.TopCentre,
                     Text = @"/ UNRANKED /",
@@ -77,7 +80,7 @@ protected override void LoadComplete()
 
         private void appearTransform()
         {
-            if (mods.Value.Any(m => !m.Ranked))
+            if (DisplayUnrankedText && mods.Value.Any(m => !m.Ranked))
                 unrankedText.FadeInFromZero(fade_duration, Easing.OutQuint);
             else
                 unrankedText.Hide();