From 1f6e1cbe56d5f0dce5c3fe60f779bdd66c5fe655 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Jan 2024 14:45:21 +0900
Subject: [PATCH] Allow interacting with playlist item buttons when not
 selected

---
 .../Screens/OnlinePlay/DrawableRoomPlaylist.cs   |  6 +++++-
 .../OnlinePlay/DrawableRoomPlaylistItem.cs       | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
index 8abdec9ade..5a1648c91f 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
@@ -165,7 +165,11 @@ namespace osu.Game.Screens.OnlinePlay
         {
             d.SelectedItem.BindTarget = SelectedItem;
             d.RequestDeletion = i => RequestDeletion?.Invoke(i);
-            d.RequestResults = i => RequestResults?.Invoke(i);
+            d.RequestResults = i =>
+            {
+                SelectedItem.Value = i;
+                RequestResults?.Invoke(i);
+            };
             d.RequestEdit = i => RequestEdit?.Invoke(i);
             d.AllowReordering = AllowReordering;
             d.AllowDeletion = AllowDeletion;
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 8f405399a7..823f6ea308 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -118,8 +118,6 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
 
-        protected override bool ShouldBeConsideredForInput(Drawable child) => AllowReordering || AllowDeletion || !AllowSelection || SelectedItem.Value == Model;
-
         public DrawableRoomPlaylistItem(PlaylistItem item)
             : base(item)
         {
@@ -367,7 +365,7 @@ namespace osu.Game.Screens.OnlinePlay
                                     AutoSizeAxes = Axes.Both,
                                     Margin = new MarginPadding { Left = 8, Right = 8 },
                                 },
-                                mainFillFlow = new FillFlowContainer
+                                mainFillFlow = new MainFlow(() => SelectedItem.Value == Model)
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
@@ -670,5 +668,17 @@ namespace osu.Game.Screens.OnlinePlay
                 public LocalisableString TooltipText => avatar.TooltipText;
             }
         }
+
+        public partial class MainFlow : FillFlowContainer
+        {
+            private readonly Func<bool> isSelected;
+
+            public override bool PropagatePositionalInputSubTree => isSelected();
+
+            public MainFlow(Func<bool> isSelected)
+            {
+                this.isSelected = isSelected;
+            }
+        }
     }
 }