From 4cce6aa1230188aa8293b2df3f44bb7b552d47a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Dec 2025 13:55:57 +0100
Subject: [PATCH] Address review concerns

---
 osu.Game/Screens/SelectV2/FilterControl.cs         |  1 +
 .../PanelBeatmapStandalone.SpreadDisplay.cs        | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/SelectV2/FilterControl.cs b/osu.Game/Screens/SelectV2/FilterControl.cs
index 2df2dcdc13..88a527b66c 100644
--- a/osu.Game/Screens/SelectV2/FilterControl.cs
+++ b/osu.Game/Screens/SelectV2/FilterControl.cs
@@ -189,6 +189,7 @@ namespace osu.Game.Screens.SelectV2
                         new ScopedBeatmapSetDisplay
                         {
                             ScopedBeatmapSet = ScopedBeatmapSet,
+                            Depth = float.MinValue, // hack to ensure that the scoped display handles `GlobalAction.Back` input before the filter control
                         }
                     },
                 }
diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs b/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs
index faa5ee5f05..32a48996a7 100644
--- a/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs
+++ b/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs
@@ -47,7 +47,8 @@ namespace osu.Game.Screens.SelectV2
 
             public SpreadDisplay()
             {
-                AutoSizeAxes = Axes.Both;
+                AutoSizeAxes = Axes.X;
+                RelativeSizeAxes = Axes.Y;
                 Content.CornerRadius = 5;
             }
 
@@ -57,6 +58,8 @@ namespace osu.Game.Screens.SelectV2
                 Add(new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
                     Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(5),
                     Padding = new MarginPadding { Horizontal = 5 },
@@ -132,15 +135,15 @@ namespace osu.Game.Screens.SelectV2
 
             private void updateBeatmap()
             {
-                preceding.Clear();
-                succeeding.Clear();
-
                 if (Beatmap.Value == null || scopedBeatmapSet.Value != null)
                 {
                     this.FadeOut(transition_duration, Easing.OutQuint);
                     return;
                 }
 
+                preceding.Clear();
+                succeeding.Clear();
+
                 var otherStarDifficulties = Beatmap.Value.BeatmapSet!.Beatmaps
                                                    .Except([Beatmap.Value])
                                                    .Where(b => b.AllowGameplayWithRuleset(ruleset.Value, showConvertedBeatmaps.Value))
@@ -218,7 +221,8 @@ namespace osu.Game.Screens.SelectV2
                 if (!Enabled.Value)
                     return false;
 
-                return base.OnMouseDown(e);
+                base.OnMouseDown(e);
+                return true;
             }
 
             protected override bool OnClick(ClickEvent e)