From e73a9c2748ad4e0c8b7c5ef263f7ccad14f4268e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Aug 2019 14:00:12 +0900
Subject: [PATCH] Fix song select context menus displaying off-screen

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 26 +++++++++++++---------
 osu.Game/Screens/Select/SongSelect.cs      |  1 -
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 7366fa8c17..6fda81e47d 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -24,7 +24,7 @@
 
 namespace osu.Game.Screens.Select
 {
-    public class BeatmapCarousel : OsuScrollContainer
+    public class BeatmapCarousel : CompositeDrawable
     {
         private const float bleed_top = FilterControl.HEIGHT;
         private const float bleed_bottom = Footer.HEIGHT;
@@ -61,6 +61,8 @@ public class BeatmapCarousel : OsuScrollContainer
         /// </summary>
         public bool BeatmapSetsLoaded { get; private set; }
 
+        private readonly OsuScrollContainer scroll;
+
         private IEnumerable<CarouselBeatmapSet> beatmapSets => root.Children.OfType<CarouselBeatmapSet>();
 
         public IEnumerable<BeatmapSetInfo> BeatmapSets
@@ -110,13 +112,17 @@ private void loadBeatmapSets(IEnumerable<BeatmapSetInfo> beatmapSets)
         public BeatmapCarousel()
         {
             root = new CarouselRoot(this);
-            Child = new OsuContextMenuContainer
+            InternalChild = new OsuContextMenuContainer
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Child = scrollableContent = new Container<DrawableCarouselItem>
+                RelativeSizeAxes = Axes.Both,
+                Child = scroll = new OsuScrollContainer
                 {
-                    RelativeSizeAxes = Axes.X,
+                    Masking = false,
+                    RelativeSizeAxes = Axes.Both,
+                    Child = scrollableContent = new Container<DrawableCarouselItem>
+                    {
+                        RelativeSizeAxes = Axes.X,
+                    }
                 }
             };
         }
@@ -127,7 +133,7 @@ private void load(OsuConfigManager config, BeatmapManager beatmaps)
             config.BindWith(OsuSetting.RandomSelectAlgorithm, RandomAlgorithm);
             config.BindWith(OsuSetting.SongSelectRightMouseScroll, RightClickScrollingEnabled);
 
-            RightClickScrollingEnabled.ValueChanged += enabled => RightMouseScrollbar = enabled.NewValue;
+            RightClickScrollingEnabled.ValueChanged += enabled => scroll.RightMouseScrollbar = enabled.NewValue;
             RightClickScrollingEnabled.TriggerChange();
 
             loadBeatmapSets(beatmaps.GetAllUsableBeatmapSetsEnumerable());
@@ -351,12 +357,12 @@ private void select(CarouselItem item)
         /// <summary>
         /// The position of the lower visible bound with respect to the current scroll position.
         /// </summary>
-        private float visibleBottomBound => Current + DrawHeight + bleed_bottom;
+        private float visibleBottomBound => scroll.Current + DrawHeight + bleed_bottom;
 
         /// <summary>
         /// The position of the upper visible bound with respect to the current scroll position.
         /// </summary>
-        private float visibleUpperBound => Current - bleed_top;
+        private float visibleUpperBound => scroll.Current - bleed_top;
 
         public void FlushPendingFilterOperations()
         {
@@ -628,7 +634,7 @@ void performMove(float y, float? startY = null)
 
         private void updateScrollPosition()
         {
-            if (scrollTarget != null) ScrollTo(scrollTarget.Value);
+            if (scrollTarget != null) scroll.ScrollTo(scrollTarget.Value);
             scrollPositionCache.Validate();
         }
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 7dd934f91a..8340814db9 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -157,7 +157,6 @@ protected SongSelect()
                                 },
                                 Child = Carousel = new BeatmapCarousel
                                 {
-                                    Masking = false,
                                     RelativeSizeAxes = Axes.Both,
                                     Size = new Vector2(1 - wedged_container_size.X, 1),
                                     Anchor = Anchor.CentreRight,