From 798c2c66667cdb7f5b2c54d59731d3ae71486894 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Dec 2017 12:57:45 +0900
Subject: [PATCH] Add special logic to song select to avoid obvious clipping
 when notifications are displayed

Not sure if we will keep this going forward (there will likely be an opaque tab control on the notifications overlay similar to options) but let's go with this for now.
---
 osu.Game/Screens/Select/FilterControl.cs |  4 +-
 osu.Game/Screens/Select/SongSelect.cs    | 48 +++++++++++++++++-------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 1b86cec613..2dbd63f77b 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Select
         {
             Children = new Drawable[]
             {
-                new Box
+                Background = new Box
                 {
                     Colour = Color4.Black,
                     Alpha = 0.8f,
@@ -167,6 +167,8 @@ namespace osu.Game.Screens.Select
 
         private Bindable<bool> showConverted;
 
+        public readonly Box Background;
+
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(OsuColour colours, OsuGame osu, OsuConfigManager config)
         {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 68ee08e721..8189624ce1 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -103,21 +103,41 @@ namespace osu.Game.Screens.Select
                         Right = left_area_padding * 2,
                     }
                 },
-                carousel = new BeatmapCarousel
+                new Container
                 {
-                    RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(carousel_width, 1),
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    SelectionChanged = carouselSelectionChanged,
-                    BeatmapSetsChanged = carouselBeatmapsLoaded,
-                },
-                FilterControl = new FilterControl
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = filter_height,
-                    FilterChanged = c => carousel.Filter(c),
-                    Exit = Exit,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 2, //avoid horizontal masking so the panels don't clip when screen stack is pushed.
+                    Child = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Width = 0.5f,
+                        Children = new Drawable[]
+                        {
+                            carousel = new BeatmapCarousel
+                            {
+                                Masking = false,
+                                RelativeSizeAxes = Axes.Y,
+                                Size = new Vector2(carousel_width, 1),
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                SelectionChanged = carouselSelectionChanged,
+                                BeatmapSetsChanged = carouselBeatmapsLoaded,
+                            },
+                            FilterControl = new FilterControl
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                Height = filter_height,
+                                FilterChanged = c => carousel.Filter(c),
+                                Background = { Width = 2 },
+                                Exit = Exit,
+                            },
+                        }
+                    },
                 },
                 beatmapInfoWedge = new BeatmapInfoWedge
                 {