From 05aa9635a8cee0503e30a5200a37ccd3c80114c9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 10 Dec 2021 00:38:18 +0900
Subject: [PATCH] Privatise button again

---
 .../TestSceneDrawableRoomPlaylist.cs            |  2 +-
 .../TestScenePlaylistsRoomSettingsPlaylist.cs   |  2 +-
 .../Online/TestSceneMultiplayerQueueList.cs     |  4 ++--
 .../OnlinePlay/DrawableRoomPlaylistItem.cs      | 17 ++++++++++++-----
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index d0cf17db1f..24d7d62aa3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -273,7 +273,7 @@ private void assertHandleVisibility(int index, bool visible)
 
         private void assertDeleteButtonVisibility(int index, bool visible)
             => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible",
-                () => (playlist.ChildrenOfType<DrawableRoomPlaylistItem>().ElementAt(2 + index * 2).RemoveButton.Alpha > 0) == visible);
+                () => (playlist.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
 
         private void createPlaylist(Action<TestPlaylist> setupPlaylist = null)
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSettingsPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSettingsPlaylist.cs
index c61b99c2c2..93ccd5f1e1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSettingsPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSettingsPlaylist.cs
@@ -126,7 +126,7 @@ private void moveToItem(int index, Vector2? offset = null)
         private void moveToDeleteButton(int index, Vector2? offset = null) => AddStep($"move mouse to delete button {index}", () =>
         {
             var item = playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index);
-            InputManager.MoveMouseTo(item.ChildrenOfType<DrawableRoomPlaylistItem>().ElementAt(0).RemoveButton, offset);
+            InputManager.MoveMouseTo(item.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(0), offset);
         });
 
         private void createPlaylist()
diff --git a/osu.Game.Tests/Visual/Online/TestSceneMultiplayerQueueList.cs b/osu.Game.Tests/Visual/Online/TestSceneMultiplayerQueueList.cs
index 95cef391f1..19e5624a04 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneMultiplayerQueueList.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneMultiplayerQueueList.cs
@@ -154,7 +154,7 @@ private void deleteItem(int index)
             AddStep($"move mouse to delete button {index}", () =>
             {
                 item = playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index);
-                InputManager.MoveMouseTo(item.ChildrenOfType<DrawableRoomPlaylistItem>().ElementAt(0).RemoveButton);
+                InputManager.MoveMouseTo(item.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(0));
             });
 
             AddStep("click", () => InputManager.Click(MouseButton.Left));
@@ -164,6 +164,6 @@ private void deleteItem(int index)
 
         private void assertDeleteButtonVisibility(int index, bool visible)
             => AddUntilStep($"delete button {index} {(visible ? "is" : "is not")} visible",
-                () => (playlist.ChildrenOfType<DrawableRoomPlaylistItem>().ElementAt(index).RemoveButton.Alpha > 0) == visible);
+                () => (playlist.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(index).Alpha > 0) == visible);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index ac5f77a72b..9640d9db46 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -59,8 +59,6 @@ public class DrawableRoomPlaylistItem : OsuRearrangeableListItem<PlaylistItem>
 
         public readonly PlaylistItem Item;
 
-        public Drawable RemoveButton { get; private set; }
-
         private readonly DelayedLoadWrapper onScreenLoader = new DelayedLoadWrapper(Empty) { RelativeSizeAxes = Axes.Both };
         private readonly IBindable<bool> valid = new Bindable<bool>();
         private readonly Bindable<IBeatmapInfo> beatmap = new Bindable<IBeatmapInfo>();
@@ -76,6 +74,7 @@ public class DrawableRoomPlaylistItem : OsuRearrangeableListItem<PlaylistItem>
         private FillFlowContainer buttonsFlow;
         private UpdateableAvatar ownerAvatar;
         private Drawable showResultsButton;
+        private Drawable removeButton;
         private PanelBackground panelBackground;
         private FillFlowContainer mainFillFlow;
 
@@ -192,8 +191,8 @@ public bool AllowDeletion
             {
                 allowDeletion = value;
 
-                if (RemoveButton != null)
-                    RemoveButton.Alpha = value ? 1 : 0;
+                if (removeButton != null)
+                    removeButton.Alpha = value ? 1 : 0;
             }
         }
 
@@ -417,7 +416,7 @@ private IEnumerable<Drawable> createButtons() => new[]
                 TooltipText = "View results"
             },
             Item.Beatmap.Value == null ? Empty() : new PlaylistDownloadButton(Item),
-            RemoveButton = new GrayButton(FontAwesome.Solid.MinusSquare)
+            removeButton = new PlaylistRemoveButton
             {
                 Size = new Vector2(30, 30),
                 Alpha = AllowDeletion ? 1 : 0,
@@ -433,6 +432,14 @@ protected override bool OnClick(ClickEvent e)
             return true;
         }
 
+        public class PlaylistRemoveButton : GrayButton
+        {
+            public PlaylistRemoveButton()
+                : base(FontAwesome.Solid.MinusSquare)
+            {
+            }
+        }
+
         private sealed class PlaylistDownloadButton : BeatmapDownloadButton
         {
             private readonly PlaylistItem playlistItem;