Cleanup around footers

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs

@@ -1,55 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Game.Beatmaps;
-using osu.Game.Online.Rooms;
-using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.OnlinePlay.Match.Components;
-using osu.Game.Tests.Visual.OnlinePlay;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    public class TestSceneMatchHeader : OnlinePlayTestScene
-    {
-        [SetUp]
-        public new void Setup() => Schedule(() =>
-        {
-            SelectedRoom.Value = new Room
-            {
-                Name = { Value = "A very awesome room" },
-                Host = { Value = new User { Id = 2, Username = "peppy" } },
-                Playlist =
-                {
-                    new PlaylistItem
-                    {
-                        Beatmap =
-                        {
-                            Value = new BeatmapInfo
-                            {
-                                Metadata = new BeatmapMetadata
-                                {
-                                    Title = "Title",
-                                    Artist = "Artist",
-                                    AuthorString = "Author",
-                                },
-                                Version = "Version",
-                                Ruleset = new OsuRuleset().RulesetInfo
-                            }
-                        },
-                        RequiredMods =
-                        {
-                            new OsuModDoubleTime(),
-                            new OsuModNoFail(),
-                            new OsuModRelax(),
-                        }
-                    }
-                }
-            };
-
-            Child = new Header();
-        });
-    }
-}

osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs

@@ -1,48 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Screens.OnlinePlay.Playlists;
-using osuTK;
-
-namespace osu.Game.Screens.OnlinePlay.Match.Components
-{
-    public class Footer : CompositeDrawable
-    {
-        public const float HEIGHT = 50;
-
-        public Action OnStart;
-
-        private readonly Drawable background;
-
-        public Footer()
-        {
-            RelativeSizeAxes = Axes.X;
-            Height = HEIGHT;
-
-            InternalChildren = new[]
-            {
-                background = new Box { RelativeSizeAxes = Axes.Both },
-                new PlaylistsReadyButton
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(600, 50),
-                    Action = () => OnStart?.Invoke()
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            background.Colour = Color4Extensions.FromHex(@"28242d");
-        }
-    }
-}

osu.Game/Screens/OnlinePlay/Match/Components/Header.cs

@@ -1,79 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Users.Drawables;
-using osuTK;
-
-namespace osu.Game.Screens.OnlinePlay.Match.Components
-{
-    public class Header : OnlinePlayComposite
-    {
-        public const float HEIGHT = 50;
-
-        private UpdateableAvatar avatar;
-        private LinkFlowContainer hostText;
-
-        public Header()
-        {
-            RelativeSizeAxes = Axes.X;
-            Height = HEIGHT;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            InternalChild = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(10, 0),
-                Children = new Drawable[]
-                {
-                    avatar = new UpdateableAvatar
-                    {
-                        Size = new Vector2(50),
-                        Masking = true,
-                        CornerRadius = 10,
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
-                        {
-                            new OsuSpriteText
-                            {
-                                Font = OsuFont.GetFont(size: 30),
-                                Current = { BindTarget = RoomName }
-                            },
-                            hostText = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 20))
-                            {
-                                AutoSizeAxes = Axes.Both,
-                                Direction = FillDirection.Horizontal,
-                            }
-                        }
-                    }
-                }
-            };
-
-            Host.BindValueChanged(host =>
-            {
-                avatar.User = host.NewValue;
-
-                hostText.Clear();
-
-                if (host.NewValue != null)
-                {
-                    hostText.AddText("hosted by ");
-                    hostText.AddUserLink(host.NewValue, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
-                }
-            }, true);
-        }
-    }
-}

osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs

@@ -103,7 +103,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
                     RowDimensions = new[]
                     {
                         new Dimension(),
-                        new Dimension(GridSizeMode.AutoSize)
+                        new Dimension(GridSizeMode.Absolute, 50)
                     },
                     Content = new[]
                     {
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
                                                             Child = new Box
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
-                                                                Colour = Color4Extensions.FromHex(@"3e3a44") // This is super temporary.
+                                                                Colour = Color4Extensions.FromHex(@"3e3a44") // Temporary.
                                                             },
                                                         },
                                                         new Container
@@ -191,9 +191,21 @@ namespace osu.Game.Screens.OnlinePlay.Match
                             },
                         },
                         // Footer
-                        new[]
+                        new Drawable[]
                         {
-                            CreateFooter()
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new[]
+                                {
+                                    new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Colour = Color4Extensions.FromHex(@"28242d") // Temporary.
+                                    },
+                                    CreateFooter()
+                                }
+                            }
                         }
                     }
                 }
@@ -382,10 +394,19 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 track.Looping = false;
         }
 
+        /// <summary>
+        /// Creates the main centred content.
+        /// </summary>
         protected abstract Drawable CreateMainContent();
 
+        /// <summary>
+        /// Creates the footer content.
+        /// </summary>
         protected abstract Drawable CreateFooter();
 
+        /// <summary>
+        /// Creates the room settings overlay.
+        /// </summary>
         protected abstract RoomSettingsOverlay CreateRoomSettingsOverlay();
 
         private class UserModSelectOverlay : LocalPlayerModSelectOverlay

osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs

@@ -2,18 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerMatchFooter : CompositeDrawable
     {
-        public const float HEIGHT = 50;
         private const float ready_button_width = 600;
         private const float spectate_button_width = 200;
 
@@ -27,54 +22,42 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             set => spectateButton.OnSpectateClick = value;
         }
 
-        private readonly Drawable background;
         private readonly MultiplayerReadyButton readyButton;
         private readonly MultiplayerSpectateButton spectateButton;
 
         public MultiplayerMatchFooter()
         {
-            RelativeSizeAxes = Axes.X;
+            RelativeSizeAxes = Axes.Both;
-            Height = HEIGHT;
 
-            InternalChildren = new[]
+            InternalChild = new GridContainer
             {
-                background = new Box { RelativeSizeAxes = Axes.Both },
+                RelativeSizeAxes = Axes.Both,
-                new GridContainer
+                Content = new[]
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    new Drawable[]
-                    Content = new[]
                     {
-                        new Drawable[]
+                        null,
+                        spectateButton = new MultiplayerSpectateButton
                         {
-                            null,
+                            RelativeSizeAxes = Axes.Both,
-                            spectateButton = new MultiplayerSpectateButton
+                        },
-                            {
+                        null,
-                                RelativeSizeAxes = Axes.Both,
+                        readyButton = new MultiplayerReadyButton
-                            },
+                        {
-                            null,
+                            RelativeSizeAxes = Axes.Both,
-                            readyButton = new MultiplayerReadyButton
+                        },
-                            {
+                        null
-                                RelativeSizeAxes = Axes.Both,
-                            },
-                            null
-                        }
-                    },
-                    ColumnDimensions = new[]
-                    {
-                        new Dimension(),
-                        new Dimension(maxSize: spectate_button_width),
-                        new Dimension(GridSizeMode.Absolute, 10),
-                        new Dimension(maxSize: ready_button_width),
-                        new Dimension()
                     }
+                },
+                ColumnDimensions = new[]
+                {
+                    new Dimension(),
+                    new Dimension(maxSize: spectate_button_width),
+                    new Dimension(GridSizeMode.Absolute, 10),
+                    new Dimension(maxSize: ready_button_width),
+                    new Dimension()
                 }
             };
         }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            background.Colour = Color4Extensions.FromHex(@"28242d");
-        }
     }
 }

osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs

@@ -94,17 +94,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }, true);
         }
 
-        protected override void UpdateMods()
-        {
-            if (SelectedItem.Value == null || client.LocalUser == null)
-                return;
-
-            // update local mods based on room's reported status for the local user (omitting the base call implementation).
-            // this makes the server authoritative, and avoids the local user potentially setting mods that the server is not aware of (ie. if the match was started during the selection being changed).
-            var ruleset = Ruleset.Value.CreateInstance();
-            Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
-        }
-
         protected override Drawable CreateMainContent() => new GridContainer
         {
             RelativeSizeAxes = Axes.Both,
@@ -236,6 +225,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override RoomSettingsOverlay CreateRoomSettingsOverlay() => new MultiplayerMatchSettingsOverlay();
 
+        protected override void UpdateMods()
+        {
+            if (SelectedItem.Value == null || client.LocalUser == null)
+                return;
+
+            // update local mods based on room's reported status for the local user (omitting the base call implementation).
+            // this makes the server authoritative, and avoids the local user potentially setting mods that the server is not aware of (ie. if the match was started during the selection being changed).
+            var ruleset = Ruleset.Value.CreateInstance();
+            Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
+        }
+
         [Resolved(canBeNull: true)]
         private DialogOverlay dialogOverlay { get; set; }
 

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomFooter.cs

@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Screens.OnlinePlay.Playlists
+{
+    public class PlaylistsRoomFooter : CompositeDrawable
+    {
+        public Action OnStart;
+
+        public PlaylistsRoomFooter()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new[]
+            {
+                new PlaylistsReadyButton
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Y,
+                    Size = new Vector2(600, 1),
+                    Action = () => OnStart?.Invoke()
+                }
+            };
+        }
+    }
+}

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs

@@ -20,7 +20,6 @@ using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
-using Footer = osu.Game.Screens.OnlinePlay.Match.Components.Footer;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
@@ -70,17 +69,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             }, true);
         }
 
-        private void updatePollingRate()
-        {
-            selectionPollingComponent.TimeBetweenPolls.Value = isIdle.Value ? 30000 : 5000;
-            Logger.Log($"Polling adjusted (selection: {selectionPollingComponent.TimeBetweenPolls.Value})");
-        }
-
-        protected override Screen CreateGameplayScreen() => new PlayerLoader(() => new PlaylistsPlayer(SelectedItem.Value)
-        {
-            Exited = () => leaderboard.RefreshScores()
-        });
-
         protected override Drawable CreateMainContent() => new GridContainer
         {
             RelativeSizeAxes = Axes.Both,
@@ -190,7 +178,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             }
         };
 
-        protected override Drawable CreateFooter() => new Footer
+        protected override Drawable CreateFooter() => new PlaylistsRoomFooter
         {
             OnStart = StartPlay
         };
@@ -203,5 +191,16 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     this.Push(new PlaylistsSongSelect());
             },
         };
+
+        private void updatePollingRate()
+        {
+            selectionPollingComponent.TimeBetweenPolls.Value = isIdle.Value ? 30000 : 5000;
+            Logger.Log($"Polling adjusted (selection: {selectionPollingComponent.TimeBetweenPolls.Value})");
+        }
+
+        protected override Screen CreateGameplayScreen() => new PlayerLoader(() => new PlaylistsPlayer(SelectedItem.Value)
+        {
+            Exited = () => leaderboard.RefreshScores()
+        });
     }
 }