Display avatars rather than full scores

osu.Game/Screens/Multi/Lounge/Components/RoomInspector.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;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
@@ -13,9 +14,10 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
@@ -36,11 +38,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         private Box statusStrip;
         private UpdateableBeatmapBackgroundSprite background;
         private ParticipantCountDisplay participantCount;
-        private FillFlowContainer topFlow;
         private OsuSpriteText name, status;
         private BeatmapTypeInfo beatmapTypeInfo;
         private ParticipantInfo participantInfo;
-        private MatchLeaderboard leaderboard;
+        private MatchParticipants participants;
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -57,7 +58,19 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     RelativeSizeAxes = Axes.Both,
                     Colour = OsuColour.FromHex(@"343138"),
                 },
-                topFlow = new FillFlowContainer
+                new GridContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    RowDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension(GridSizeMode.Distributed),
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            new FillFlowContainer
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
@@ -146,38 +159,37 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                                     },
                                 },
                             },
-                leaderboard = new MatchLeaderboard
+                        },
+                        new Drawable[]
                         {
-                    Anchor = Anchor.BottomLeft,
+                            participants = new MatchParticipants
-                    Origin = Anchor.BottomLeft,
+                            {
-                    RelativeSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Top = contentPadding.Top, Left = 38, Right = 37 },
+                            }
+                        }
+                    }
                 }
             };
 
             participantInfo.Host.BindTo(bindings.Host);
             participantInfo.ParticipantCount.BindTo(bindings.ParticipantCount);
             participantInfo.Participants.BindTo(bindings.Participants);
-
             participantCount.Participants.BindTo(bindings.Participants);
             participantCount.ParticipantCount.BindTo(bindings.ParticipantCount);
             participantCount.MaxParticipants.BindTo(bindings.MaxParticipants);
-
             beatmapTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap);
             beatmapTypeInfo.Ruleset.BindTo(bindings.CurrentRuleset);
             beatmapTypeInfo.Type.BindTo(bindings.Type);
             background.Beatmap.BindTo(bindings.CurrentBeatmap);
-
             bindings.Status.BindValueChanged(displayStatus);
             bindings.Name.BindValueChanged(n => name.Text = n);
-
             Room.BindValueChanged(updateRoom, true);
         }
 
         private void updateRoom(Room room)
         {
             bindings.Room = room;
-            leaderboard.Room = room;
+            participants.Room = room;
 
             if (room != null)
             {
@@ -197,13 +209,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             }
         }
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            leaderboard.Height = DrawHeight - topFlow.DrawHeight;
-        }
-
         private void displayStatus(RoomStatus s)
         {
             status.Text = s.Message;
@@ -213,7 +218,86 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             status.FadeColour(c, transition_duration);
         }
 
-        private class UserTile : Container, IHasTooltip
+        private class RoomStatusNoneSelected : RoomStatus
+        {
+            public override string Message => @"No Room Selected";
+            public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray8;
+        }
+
+        private class MatchParticipants : CompositeDrawable
+        {
+            private Room room;
+            private readonly FillFlowContainer fill;
+
+            public Room Room
+            {
+                get { return room; }
+                set
+                {
+                    if (room == value)
+                        return;
+
+                    room = value;
+                    updateParticipants();
+                }
+            }
+
+            public MatchParticipants()
+            {
+                Padding = new MarginPadding { Horizontal = 10 };
+
+                InternalChild = new ScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = fill = new FillFlowContainer
+                    {
+                        Spacing = new Vector2(10),
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Full,
+                    }
+                };
+            }
+
+            [Resolved]
+            private APIAccess api { get; set; }
+
+            private GetRoomScoresRequest request;
+
+            private void updateParticipants()
+            {
+                var roomId = room.RoomID.Value ?? 0;
+
+                request?.Cancel();
+
+                // nice little progressive fade
+                int time = 500;
+                foreach (var c in fill.Children)
+                {
+                    c.Delay(500 - time).FadeOut(time, Easing.Out);
+                    time = Math.Max(20, time - 20);
+                    c.Expire();
+                }
+
+                if (roomId == 0) return;
+
+                request = new GetRoomScoresRequest(roomId);
+                request.Success += scores =>
+                {
+                    if (roomId != room.RoomID.Value)
+                        return;
+
+                    fill.Clear();
+                    foreach (var s in scores)
+                        fill.Add(new UserTile(s.User));
+
+                    fill.FadeInFromZero(1000, Easing.OutQuint);
+                };
+
+                api.Queue(request);
+            }
+
+            private class UserTile : CompositeDrawable, IHasTooltip
             {
                 private readonly User user;
 
@@ -226,7 +310,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     CornerRadius = 5f;
                     Masking = true;
 
-                Children = new Drawable[]
+                    InternalChildren = new Drawable[]
                     {
                         new Box
                         {
@@ -241,11 +325,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     };
                 }
             }
-
-        private class RoomStatusNoneSelected : RoomStatus
-        {
-            public override string Message => @"No Room Selected";
-            public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray8;
         }
     }
 }