From 273042aa16882993f553e9eb43fa44d2bdf25faa Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 9 Dec 2021 01:47:46 +0900
Subject: [PATCH] Add virtual method for creating different
 DrawablePlaylistItem types

---
 .../OnlinePlay/DrawableRoomPlaylist.cs        | 22 ++++++++++---------
 .../Match/Playlist/MultiplayerHistoryList.cs  |  9 ++++----
 .../Match/Playlist/MultiplayerQueueList.cs    |  9 ++++----
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
index 5e58514705..1abc7c47d6 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
@@ -131,16 +131,18 @@ namespace osu.Game.Screens.OnlinePlay
             Spacing = new Vector2(0, 2)
         };
 
-        protected override OsuRearrangeableListItem<PlaylistItem> CreateOsuDrawable(PlaylistItem item) => new DrawableRoomPlaylistItem(item)
+        protected sealed override OsuRearrangeableListItem<PlaylistItem> CreateOsuDrawable(PlaylistItem item) => CreateDrawablePlaylistItem(item).With(d =>
         {
-            SelectedItem = { BindTarget = SelectedItem },
-            RequestDeletion = i => DeletionRequested?.Invoke(i),
-            AllowReordering = AllowReordering,
-            AllowDeletion = AllowDeletion,
-            AllowSelection = AllowSelection,
-            AllowShowingResults = AllowShowingResults,
-            ShowItemOwner = ShowItemOwners,
-            ShowResultsRequested = i => ShowResultsRequested?.Invoke(i)
-        };
+            d.SelectedItem.BindTarget = SelectedItem;
+            d.RequestDeletion = i => DeletionRequested?.Invoke(i);
+            d.AllowReordering = AllowReordering;
+            d.AllowDeletion = AllowDeletion;
+            d.AllowSelection = AllowSelection;
+            d.AllowShowingResults = AllowShowingResults;
+            d.ShowItemOwner = ShowItemOwners;
+            d.ShowResultsRequested = i => ShowResultsRequested?.Invoke(i);
+        });
+
+        protected virtual DrawableRoomPlaylistItem CreateDrawablePlaylistItem(PlaylistItem item) => new DrawableRoomPlaylistItem(item);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerHistoryList.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerHistoryList.cs
index 7102738271..32d355d149 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerHistoryList.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerHistoryList.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Containers;
 using osu.Game.Online.Rooms;
 using osuTK;
 
@@ -16,14 +15,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match.Playlist
     /// </summary>
     public class MultiplayerHistoryList : DrawableRoomPlaylist
     {
+        public MultiplayerHistoryList()
+        {
+            ShowItemOwners = true;
+        }
+
         protected override FillFlowContainer<RearrangeableListItem<PlaylistItem>> CreateListFillFlowContainer() => new HistoryFillFlowContainer
         {
             Spacing = new Vector2(0, 2)
         };
 
-        protected override OsuRearrangeableListItem<PlaylistItem> CreateOsuDrawable(PlaylistItem item)
-            => base.CreateOsuDrawable(item).With(d => ((DrawableRoomPlaylistItem)d).ShowItemOwner = true);
-
         private class HistoryFillFlowContainer : FillFlowContainer<RearrangeableListItem<PlaylistItem>>
         {
             public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.OfType<RearrangeableListItem<PlaylistItem>>().OrderByDescending(item => item.Model.PlayedAt);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerQueueList.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerQueueList.cs
index 814ea48646..7dfee36895 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerQueueList.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerQueueList.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Containers;
 using osu.Game.Online.Rooms;
 using osuTK;
 
@@ -18,14 +17,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match.Playlist
     /// </summary>
     public class MultiplayerQueueList : DrawableRoomPlaylist
     {
+        public MultiplayerQueueList()
+        {
+            ShowItemOwners = true;
+        }
+
         protected override FillFlowContainer<RearrangeableListItem<PlaylistItem>> CreateListFillFlowContainer() => new QueueFillFlowContainer
         {
             Spacing = new Vector2(0, 2)
         };
 
-        protected override OsuRearrangeableListItem<PlaylistItem> CreateOsuDrawable(PlaylistItem item)
-            => base.CreateOsuDrawable(item).With(d => ((DrawableRoomPlaylistItem)d).ShowItemOwner = true);
-
         private class QueueFillFlowContainer : FillFlowContainer<RearrangeableListItem<PlaylistItem>>
         {
             [Resolved(typeof(Room), nameof(Room.Playlist))]