From ded09b78cbbda03d95df2c75f17785a02b84c434 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 16:33:37 +0900
Subject: [PATCH] Avoid usage of AutoSize for DrawableCarouselItems in general

---
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs     |  3 +--
 .../Screens/Select/Carousel/DrawableCarouselItem.cs   | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 9a822f83e3..a6cea5ee53 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -192,8 +192,7 @@ namespace osu.Game.Screens.Select.Carousel
                 beatmapContainer = new Container<DrawableCarouselItem>
                 {
                     X = 100,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.Both,
                     ChildrenEnumerable = visibleBeatmaps
                 };
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index 5bcaffa3cf..68825873ff 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -63,7 +63,6 @@ namespace osu.Game.Screens.Select.Carousel
         protected DrawableCarouselItem()
         {
             RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
 
             Alpha = 0;
 
@@ -71,15 +70,13 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 MovementContainer = new Container
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
                         Header = new CarouselHeader(),
                         Content = new Container
                         {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
+                            RelativeSizeAxes = Axes.Both,
                         }
                     }
                 },
@@ -123,6 +120,10 @@ namespace osu.Game.Screens.Select.Carousel
 
         protected virtual void ApplyState()
         {
+            // Use the fact that we know the precise height of the item from the model to avoid the need for AutoSize overhead.
+            // Additionally, AutoSize doesn't work well due to content starting off-screen and being masked away.
+            Height = Item.TotalHeight;
+
             Debug.Assert(Item != null);
 
             switch (Item.State.Value)