From 9c707ed3418b5bde88dd76d5d5f790fb69decb1b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Nov 2024 16:47:54 +0900
Subject: [PATCH] Rename class and fix padding considerations

---
 ...ings.cs => ExpandingPlayerSettingsOverlay.cs} | 16 ++++++++++++----
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiSpectatorSettings.cs => ExpandingPlayerSettingsOverlay.cs} (75%)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorSettings.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ExpandingPlayerSettingsOverlay.cs
similarity index 75%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorSettings.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ExpandingPlayerSettingsOverlay.cs
index dfb26d104a..6ad53d4aeb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorSettings.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ExpandingPlayerSettingsOverlay.cs
@@ -8,15 +8,21 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play.HUD;
+using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public partial class MultiSpectatorSettings : ExpandingContainer
+    public partial class ExpandingPlayerSettingsOverlay : ExpandingContainer
     {
-        public const float CONTRACTED_WIDTH = 30;
-        public const int EXPANDED_WIDTH = 300;
+        private const float padding = 10;
 
-        public MultiSpectatorSettings()
+        public const float CONTRACTED_WIDTH = button_size + padding * 2;
+        public const float EXPANDED_WIDTH = player_settings_width + button_size + padding * 3;
+
+        private const float player_settings_width = 270;
+        private const float button_size = IconButton.DEFAULT_BUTTON_SIZE;
+
+        public ExpandingPlayerSettingsOverlay()
             : base(CONTRACTED_WIDTH, EXPANDED_WIDTH)
         {
             Origin = Anchor.TopRight;
@@ -30,6 +36,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 Anchor = Anchor.TopLeft,
                 Direction = FillDirection.Horizontal,
                 AutoSizeAxes = Axes.Both,
+                Margin = new MarginPadding(padding),
+                Spacing = new Vector2(padding),
                 Children = new Drawable[]
                 {
                     new IconButton
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 841aaf7a45..44d26a6dd0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 {
                     ReadyToStart = performInitialSeek,
                 },
-                new MultiSpectatorSettings()
+                new ExpandingPlayerSettingsOverlay()
             };
 
             for (int i = 0; i < Users.Count; i++)