Merge branch 'master' into exit-multi-from-null

osu.Android.props

@@ -63,6 +63,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.702.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.723.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.726.2" />
   </ItemGroup>
 </Project>

osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs

@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Description => @"Play with no approach circles and fading circles/sliders.";
         public override double ScoreMultiplier => 1.06;
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpinIn) };
         private const double fade_in_duration_multiplier = 0.4;
         private const double fade_out_duration_multiplier = 0.3;
 

osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs

@@ -0,0 +1,92 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModSpinIn : Mod, IApplicableToDrawableHitObjects, IReadFromConfig
+    {
+        public override string Name => "Spin In";
+        public override string Acronym => "SI";
+        public override IconUsage Icon => FontAwesome.Solid.Undo;
+        public override ModType Type => ModType.Fun;
+        public override string Description => "Circles spin in. No approach circles.";
+        public override double ScoreMultiplier => 1;
+
+        // todo: this mod should be able to be compatible with hidden with a bit of further implementation.
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModeObjectScaleTween), typeof(OsuModHidden) };
+
+        private const int rotate_offset = 360;
+        private const float rotate_starting_width = 2;
+
+        private Bindable<bool> increaseFirstObjectVisibility = new Bindable<bool>();
+
+        public void ReadFromConfig(OsuConfigManager config)
+        {
+            increaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
+        }
+
+        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        {
+            foreach (var drawable in drawables.Skip(increaseFirstObjectVisibility.Value ? 1 : 0))
+            {
+                switch (drawable)
+                {
+                    case DrawableSpinner _:
+                        continue;
+
+                    default:
+                        drawable.ApplyCustomUpdateState += applyZoomState;
+                        break;
+                }
+            }
+        }
+
+        private void applyZoomState(DrawableHitObject drawable, ArmedState state)
+        {
+            var h = (OsuHitObject)drawable.HitObject;
+
+            switch (drawable)
+            {
+                case DrawableHitCircle circle:
+                    using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
+                    {
+                        circle.ApproachCircle.Hide();
+
+                        circle.RotateTo(rotate_offset).Then().RotateTo(0, h.TimePreempt, Easing.InOutSine);
+                        circle.ScaleTo(new Vector2(rotate_starting_width, 0)).Then().ScaleTo(1, h.TimePreempt, Easing.InOutSine);
+
+                        // bypass fade in.
+                        if (state == ArmedState.Idle)
+                            circle.FadeIn();
+                    }
+
+                    break;
+
+                case DrawableSlider slider:
+                    using (slider.BeginAbsoluteSequence(h.StartTime - h.TimePreempt))
+                    {
+                        slider.ScaleTo(0).Then().ScaleTo(1, h.TimePreempt, Easing.InOutSine);
+
+                        // bypass fade in.
+                        if (state == ArmedState.Idle)
+                            slider.FadeIn();
+                    }
+
+                    break;
+            }
+        }
+    }
+}

osu.Game.Rulesets.Osu/Mods/OsuModeObjectScaleTween.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
@@ -28,6 +29,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private Bindable<bool> increaseFirstObjectVisibility = new Bindable<bool>();
 
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpinIn) };
+
         public void ReadFromConfig(OsuConfigManager config)
         {
             increaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
@@ -64,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableSlider _:
                 case DrawableHitCircle _:
                 {
-                    using (drawable.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
+                    using (drawable.BeginAbsoluteSequence(h.StartTime - h.TimePreempt))
                         drawable.ScaleTo(StartScale).Then().ScaleTo(EndScale, h.TimePreempt, Easing.OutSine);
                     break;
                 }
@@ -75,7 +78,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 case DrawableHitCircle circle:
                     // we don't want to see the approach circle
-                    using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true))
+                    using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt))
                         circle.ApproachCircle.Hide();
                     break;
             }

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBody.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
@@ -75,22 +76,22 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         protected SliderBody()
         {
-            InternalChild = path = new SliderPath();
+            RecyclePath();
         }
 
         /// <summary>
         /// Initialises a new <see cref="SliderPath"/>, releasing all resources retained by the old one.
         /// </summary>
-        public void RecyclePath()
+        public virtual void RecyclePath()
         {
             InternalChild = path = new SliderPath
             {
-                Position = path.Position,
+                Position = path?.Position ?? Vector2.Zero,
-                PathRadius = path.PathRadius,
+                PathRadius = path?.PathRadius ?? 10,
-                AccentColour = path.AccentColour,
+                AccentColour = path?.AccentColour ?? Color4.White,
-                BorderColour = path.BorderColour,
+                BorderColour = path?.BorderColour ?? Color4.White,
-                BorderSize = path.BorderSize,
+                BorderSize = path?.BorderSize ?? DEFAULT_BORDER_SIZE,
-                Vertices = path.Vertices
+                Vertices = path?.Vertices ?? Array.Empty<Vector2>()
             };
         }
 

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SnakingSliderBody.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 
@@ -78,9 +79,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             slider.Path.GetPathToProgress(CurrentCurve, 0, 1);
             SetVertices(CurrentCurve);
 
-            // The body is sized to the full path size to avoid excessive autosize computations
+            // Force the body to be the final path size to avoid excessive autosize computations
+            Path.AutoSizeAxes = Axes.Both;
             Size = Path.Size;
 
+            updatePathSize();
+
             snakedPosition = Path.PositionInBoundingBox(Vector2.Zero);
             snakedPathOffset = Path.PositionInBoundingBox(Path.Vertices[0]);
 
@@ -93,6 +97,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             setRange(lastSnakedStart, lastSnakedEnd);
         }
 
+        public override void RecyclePath()
+        {
+            base.RecyclePath();
+            updatePathSize();
+        }
+
+        private void updatePathSize()
+        {
+            // Force the path to its final size to avoid excessive framebuffer resizes
+            Path.AutoSizeAxes = Axes.None;
+            Path.Size = Size;
+        }
+
         private void setRange(double p0, double p1)
         {
             if (p0 > p1)

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -134,6 +134,7 @@ namespace osu.Game.Rulesets.Osu
                     {
                         new OsuModTransform(),
                         new OsuModWiggle(),
+                        new OsuModSpinIn(),
                         new MultiMod(new OsuModGrow(), new OsuModDeflate()),
                         new MultiMod(new ModWindUp<OsuHitObject>(), new ModWindDown<OsuHitObject>()),
                     };

osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs

@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Online
         private TestChatOverlay chatOverlay;
         private ChannelManager channelManager;
 
-        private readonly Channel channel1 = new Channel(new User()) { Name = "test1" };
+        private readonly Channel channel1 = new Channel(new User()) { Name = "test really long username" };
         private readonly Channel channel2 = new Channel(new User()) { Name = "test2" };
 
         [SetUp]

osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs

@@ -47,8 +47,8 @@ namespace osu.Game.Tournament.Screens.MapPool
                 mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
                 {
                     Y = 100,
-                    Spacing = new Vector2(10, 20),
+                    Spacing = new Vector2(10, 10),
-                    Padding = new MarginPadding(50),
+                    Padding = new MarginPadding(25),
                     Direction = FillDirection.Vertical,
                     RelativeSizeAxes = Axes.Both,
                 },
@@ -218,7 +218,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                     {
                         mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>
                         {
-                            Spacing = new Vector2(10, 20),
+                            Spacing = new Vector2(10, 5),
                             Direction = FillDirection.Full,
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y

osu.Game/Beatmaps/BeatmapManager.cs

@@ -386,7 +386,7 @@ namespace osu.Game.Beatmaps
                     beatmap.OnlineBeatmapID = res.OnlineBeatmapID;
                 };
 
-                req.Failure += e => { LogForModel(set, $"Online retrieval failed for {beatmap}", e); };
+                req.Failure += e => { LogForModel(set, $"Online retrieval failed for {beatmap} ({e.Message})"); };
 
                 // intentionally blocking to limit web request concurrency
                 req.Perform(api);

osu.Game/Graphics/UserInterface/LineGraph.cs

@@ -76,7 +76,12 @@ namespace osu.Game.Graphics.UserInterface
             {
                 Masking = true,
                 RelativeSizeAxes = Axes.Both,
-                Child = path = new SmoothPath { RelativeSizeAxes = Axes.Both, PathRadius = 1 }
+                Child = path = new SmoothPath
+                {
+                    AutoSizeAxes = Axes.None,
+                    RelativeSizeAxes = Axes.Both,
+                    PathRadius = 1
+                }
             });
         }
 

osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs

@@ -64,7 +64,7 @@ namespace osu.Game.Graphics.UserInterface
                     Direction = FillDirection.Horizontal,
                     Children = new Drawable[]
                     {
-                        text = new OsuSpriteText { Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold) },
+                        text = new OsuSpriteText { Font = OsuFont.GetFont(size: 14) },
                         icon = new SpriteIcon
                         {
                             Size = new Vector2(14),
@@ -84,7 +84,11 @@ namespace osu.Game.Graphics.UserInterface
                 }
             };
 
-            Current.ValueChanged += selected => { icon.Icon = selected.NewValue ? FontAwesome.Regular.CheckCircle : FontAwesome.Regular.Circle; };
+            Current.ValueChanged += selected =>
+            {
+                icon.Icon = selected.NewValue ? FontAwesome.Regular.CheckCircle : FontAwesome.Regular.Circle;
+                text.Font = text.Font.With(weight: selected.NewValue ? FontWeight.Bold : FontWeight.Medium);
+            };
         }
 
         [BackgroundDependencyLoader]

osu.Game/OsuGame.cs

@@ -589,7 +589,7 @@ namespace osu.Game
         {
             int recentLogCount = 0;
 
-            const double debounce = 5000;
+            const double debounce = 60000;
 
             Logger.NewEntry += entry =>
             {

osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs

@@ -13,6 +13,8 @@ namespace osu.Game.Overlays.Chat.Tabs
 
         public override bool IsSwitchable => false;
 
+        protected override bool IsBoldWhenActive => false;
+
         public ChannelSelectorTabItem()
             : base(new ChannelSelectorTabChannel())
         {
@@ -22,7 +24,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             Icon.Alpha = 0;
 
             Text.Font = Text.Font.With(size: 45);
-            TextBold.Font = Text.Font.With(size: 45);
+            Text.Truncate = false;
         }
 
         [BackgroundDependencyLoader]

osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs

@@ -29,7 +29,6 @@ namespace osu.Game.Overlays.Chat.Tabs
         public override bool IsRemovable => !Pinned;
 
         protected readonly SpriteText Text;
-        protected readonly SpriteText TextBold;
         protected readonly ClickableContainer CloseButton;
         private readonly Box box;
         private readonly Box highlightBox;
@@ -88,20 +87,17 @@ namespace osu.Game.Overlays.Chat.Tabs
                         },
                         Text = new OsuSpriteText
                         {
-                            Margin = new MarginPadding(5),
                             Origin = Anchor.CentreLeft,
                             Anchor = Anchor.CentreLeft,
                             Text = value.ToString(),
-                            Font = OsuFont.GetFont(size: 18)
+                            Font = OsuFont.GetFont(size: 18),
-                        },
+                            Padding = new MarginPadding(5)
-                        TextBold = new OsuSpriteText
+                            {
-                        {
+                                Left = LeftTextPadding,
-                            Alpha = 0,
+                                Right = RightTextPadding,
-                            Margin = new MarginPadding(5),
+                            },
-                            Origin = Anchor.CentreLeft,
+                            RelativeSizeAxes = Axes.X,
-                            Anchor = Anchor.CentreLeft,
+                            Truncate = true,
-                            Text = value.ToString(),
-                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold)
                         },
                         CloseButton = new TabCloseButton
                         {
@@ -119,10 +115,16 @@ namespace osu.Game.Overlays.Chat.Tabs
             };
         }
 
+        protected virtual float LeftTextPadding => 5;
+
+        protected virtual float RightTextPadding => IsRemovable ? 40 : 5;
+
         protected virtual IconUsage DisplayIcon => FontAwesome.Solid.Hashtag;
 
         protected virtual bool ShowCloseOnHover => true;
 
+        protected virtual bool IsBoldWhenActive => true;
+
         protected override bool OnHover(HoverEvent e)
         {
             if (IsRemovable && ShowCloseOnHover)
@@ -203,8 +205,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             box.FadeColour(BackgroundActive, TRANSITION_LENGTH, Easing.OutQuint);
             highlightBox.FadeIn(TRANSITION_LENGTH, Easing.OutQuint);
 
-            Text.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
+            if (IsBoldWhenActive) Text.Font = Text.Font.With(weight: FontWeight.Bold);
-            TextBold.FadeIn(TRANSITION_LENGTH, Easing.OutQuint);
         }
 
         protected virtual void FadeInactive()
@@ -216,8 +217,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             box.FadeColour(BackgroundInactive, TRANSITION_LENGTH, Easing.OutQuint);
             highlightBox.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
 
-            Text.FadeIn(TRANSITION_LENGTH, Easing.OutQuint);
+            Text.Font = Text.Font.With(weight: FontWeight.Medium);
-            TextBold.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
         }
 
         protected override void OnActivated() => updateState();

osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs

@@ -62,11 +62,10 @@ namespace osu.Game.Overlays.Chat.Tabs
             });
 
             avatar.OnLoadComplete += d => d.FadeInFromZero(300, Easing.OutQuint);
-
-            Text.X = ChatOverlay.TAB_AREA_HEIGHT;
-            TextBold.X = ChatOverlay.TAB_AREA_HEIGHT;
         }
 
+        protected override float LeftTextPadding => base.LeftTextPadding + ChatOverlay.TAB_AREA_HEIGHT;
+
         protected override bool ShowCloseOnHover => false;
 
         protected override void FadeActive()

osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

@@ -147,12 +147,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (State.Value == newState && !force)
                 return;
 
-            // apply any custom state overrides
-            ApplyCustomUpdateState?.Invoke(this, newState);
-
-            if (newState == ArmedState.Hit)
-                PlaySamples();
-
             if (UseTransformStateManagement)
             {
                 double transformTime = HitObject.StartTime - InitialLifetimeOffset;
@@ -177,6 +171,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 state.Value = newState;
 
             UpdateState(newState);
+
+            // apply any custom state overrides
+            ApplyCustomUpdateState?.Invoke(this, newState);
+
+            if (newState == ArmedState.Hit)
+                PlaySamples();
         }
 
         /// <summary>

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -26,6 +26,9 @@ namespace osu.Game.Screens.Select
 {
     public class BeatmapCarousel : OsuScrollContainer
     {
+        private const float bleed_top = FilterControl.HEIGHT;
+        private const float bleed_bottom = Footer.HEIGHT;
+
         /// <summary>
         /// Triggered when the <see cref="BeatmapSets"/> loaded change and are completely loaded.
         /// </summary>
@@ -81,7 +84,8 @@ namespace osu.Game.Screens.Select
             itemsCache.Invalidate();
             scrollPositionCache.Invalidate();
 
-            Schedule(() =>
+            // Run on late scheduler want to ensure this runs after all pending UpdateBeatmapSet / RemoveBeatmapSet operations are run.
+            SchedulerAfterChildren.Add(() =>
             {
                 BeatmapSetsChanged?.Invoke();
                 BeatmapSetsLoaded = true;
@@ -129,19 +133,16 @@ namespace osu.Game.Screens.Select
             loadBeatmapSets(beatmaps.GetAllUsableBeatmapSetsEnumerable());
         }
 
-        public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet)
+        public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
         {
-            Schedule(() =>
+            var existingSet = beatmapSets.FirstOrDefault(b => b.BeatmapSet.ID == beatmapSet.ID);
-            {
-                var existingSet = beatmapSets.FirstOrDefault(b => b.BeatmapSet.ID == beatmapSet.ID);
 
-                if (existingSet == null)
+            if (existingSet == null)
-                    return;
+                return;
 
-                root.RemoveChild(existingSet);
+            root.RemoveChild(existingSet);
-                itemsCache.Invalidate();
+            itemsCache.Invalidate();
-            });
+        });
-        }
 
         public void UpdateBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
         {
@@ -338,6 +339,25 @@ namespace osu.Game.Screens.Select
 
         public bool AllowSelection = true;
 
+        /// <summary>
+        /// Half the height of the visible content.
+        /// <remarks>
+        /// This is different from the height of <see cref="ScrollContainer{T}.displayableContent"/>, since
+        /// the beatmap carousel bleeds into the <see cref="FilterControl"/> and the <see cref="Footer"/>
+        /// </remarks>
+        /// </summary>
+        private float visibleHalfHeight => (DrawHeight + bleed_bottom + bleed_top) / 2;
+
+        /// <summary>
+        /// The position of the lower visible bound with respect to the current scroll position.
+        /// </summary>
+        private float visibleBottomBound => 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;
+
         public void FlushPendingFilterOperations()
         {
             if (PendingFilter?.Completed == false)
@@ -414,6 +434,8 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
+        protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => ReceivePositionalInputAt(screenSpacePos);
+
         protected override void Update()
         {
             base.Update();
@@ -424,17 +446,15 @@ namespace osu.Game.Screens.Select
             if (!scrollPositionCache.IsValid)
                 updateScrollPosition();
 
-            float drawHeight = DrawHeight;
-
             // Remove all items that should no longer be on-screen
-            scrollableContent.RemoveAll(p => p.Y < Current - p.DrawHeight || p.Y > Current + drawHeight || !p.IsPresent);
+            scrollableContent.RemoveAll(p => p.Y < visibleUpperBound - p.DrawHeight || p.Y > visibleBottomBound || !p.IsPresent);
 
             // Find index range of all items that should be on-screen
             Trace.Assert(Items.Count == yPositions.Count);
 
-            int firstIndex = yPositions.BinarySearch(Current - DrawableCarouselItem.MAX_HEIGHT);
+            int firstIndex = yPositions.BinarySearch(visibleUpperBound - DrawableCarouselItem.MAX_HEIGHT);
             if (firstIndex < 0) firstIndex = ~firstIndex;
-            int lastIndex = yPositions.BinarySearch(Current + drawHeight);
+            int lastIndex = yPositions.BinarySearch(visibleBottomBound);
             if (lastIndex < 0) lastIndex = ~lastIndex;
 
             int notVisibleCount = 0;
@@ -486,9 +506,8 @@ namespace osu.Game.Screens.Select
 
             // Update externally controlled state of currently visible items
             // (e.g. x-offset and opacity).
-            float halfHeight = drawHeight / 2;
             foreach (DrawableCarouselItem p in scrollableContent.Children)
-                updateItem(p, halfHeight);
+                updateItem(p);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -542,7 +561,7 @@ namespace osu.Game.Screens.Select
 
             yPositions.Clear();
 
-            float currentY = DrawHeight / 2;
+            float currentY = visibleHalfHeight;
             DrawableCarouselBeatmapSet lastSet = null;
 
             scrollTarget = null;
@@ -575,7 +594,6 @@ namespace osu.Game.Screens.Select
 
                             float? setY = null;
                             if (!d.IsLoaded || beatmap.Alpha == 0) // can't use IsPresent due to DrawableCarouselItem override.
-                                // ReSharper disable once PossibleNullReferenceException (resharper broken?)
                                 setY = lastSet.Y + lastSet.DrawHeight + 5;
 
                             if (d.IsLoaded)
@@ -596,7 +614,7 @@ namespace osu.Game.Screens.Select
                     currentY += d.DrawHeight + 5;
             }
 
-            currentY += DrawHeight / 2;
+            currentY += visibleHalfHeight;
             scrollableContent.Height = currentY;
 
             if (BeatmapSetsLoaded && (selectedBeatmapSet == null || selectedBeatmap == null || selectedBeatmapSet.State.Value != CarouselItemState.Selected))
@@ -637,18 +655,15 @@ namespace osu.Game.Screens.Select
         /// the current scroll position.
         /// </summary>
         /// <param name="p">The item to be updated.</param>
-        /// <param name="halfHeight">Half the draw height of the carousel container.</param>
+        private void updateItem(DrawableCarouselItem p)
-        private void updateItem(DrawableCarouselItem p, float halfHeight)
         {
-            var height = p.IsPresent ? p.DrawHeight : 0;
+            float itemDrawY = p.Position.Y - visibleUpperBound + p.DrawHeight / 2;
-
+            float dist = Math.Abs(1f - itemDrawY / visibleHalfHeight);
-            float itemDrawY = p.Position.Y - Current + height / 2;
-            float dist = Math.Abs(1f - itemDrawY / halfHeight);
 
             // Setting the origin position serves as an additive position on top of potential
             // local transformation we may want to apply (e.g. when a item gets selected, we
             // may want to smoothly transform it leftwards.)
-            p.OriginPosition = new Vector2(-offsetX(dist, halfHeight), 0);
+            p.OriginPosition = new Vector2(-offsetX(dist, visibleHalfHeight), 0);
 
             // We are applying a multiplicative alpha (which is internally done by nesting an
             // additional container and setting that container's alpha) such that we can

osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs

@@ -25,22 +25,6 @@ namespace osu.Game.Screens.Select
 
         private Bindable<BeatmapDetailTab> selectedTab;
 
-        private void invokeOnFilter()
-        {
-            OnFilter?.Invoke(tabs.Current.Value, modsCheckbox.Current.Value);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colour, OsuConfigManager config)
-        {
-            modsCheckbox.AccentColour = tabs.AccentColour = colour.YellowLight;
-
-            selectedTab = config.GetBindable<BeatmapDetailTab>(OsuSetting.BeatmapDetailTab);
-
-            tabs.Current.BindTo(selectedTab);
-            tabs.Current.TriggerChange();
-        }
-
         public BeatmapDetailAreaTabControl()
         {
             Height = HEIGHT;
@@ -66,12 +50,31 @@ namespace osu.Game.Screens.Select
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
                     Text = @"Mods",
+                    Alpha = 0,
                 },
             };
 
             tabs.Current.ValueChanged += _ => invokeOnFilter();
             modsCheckbox.Current.ValueChanged += _ => invokeOnFilter();
         }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour, OsuConfigManager config)
+        {
+            modsCheckbox.AccentColour = tabs.AccentColour = colour.YellowLight;
+
+            selectedTab = config.GetBindable<BeatmapDetailTab>(OsuSetting.BeatmapDetailTab);
+
+            tabs.Current.BindTo(selectedTab);
+            tabs.Current.TriggerChange();
+        }
+
+        private void invokeOnFilter()
+        {
+            OnFilter?.Invoke(tabs.Current.Value, modsCheckbox.Current.Value);
+
+            modsCheckbox.FadeTo(tabs.Current.Value == BeatmapDetailTab.Details ? 0 : 1, 200, Easing.OutQuint);
+        }
     }
 
     public enum BeatmapDetailTab

osu.Game/Screens/Select/FilterControl.cs

@@ -14,7 +14,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Select.Filter;
 using Container = osu.Framework.Graphics.Containers.Container;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 
@@ -22,6 +21,8 @@ namespace osu.Game.Screens.Select
 {
     public class FilterControl : Container
     {
+        public const float HEIGHT = 100;
+
         public Action<FilterCriteria> FilterChanged;
 
         private readonly OsuTabControl<SortMode> sortTabs;
@@ -187,11 +188,5 @@ namespace osu.Game.Screens.Select
         }
 
         private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());
-
-        protected override bool OnMouseDown(MouseDownEvent e) => true;
-
-        protected override bool OnMouseMove(MouseMoveEvent e) => true;
-
-        protected override bool OnClick(ClickEvent e) => true;
     }
 }

osu.Game/Screens/Select/SongSelect.cs

@@ -121,7 +121,7 @@ namespace osu.Game.Screens.Select
                     Size = new Vector2(wedged_container_size.X, 1),
                     Padding = new MarginPadding
                     {
-                        Bottom = 50,
+                        Bottom = Footer.HEIGHT,
                         Top = wedged_container_size.Y + left_area_padding,
                         Left = left_area_padding,
                         Right = left_area_padding * 2,
@@ -147,20 +147,29 @@ namespace osu.Game.Screens.Select
                         Width = 0.5f,
                         Children = new Drawable[]
                         {
-                            Carousel = new BeatmapCarousel
+                            new Container
                             {
-                                Masking = false,
                                 RelativeSizeAxes = Axes.Both,
-                                Size = new Vector2(1 - wedged_container_size.X, 1),
+                                Padding = new MarginPadding
-                                Anchor = Anchor.CentreRight,
+                                {
-                                Origin = Anchor.CentreRight,
+                                    Top = FilterControl.HEIGHT,
-                                SelectionChanged = updateSelectedBeatmap,
+                                    Bottom = Footer.HEIGHT
-                                BeatmapSetsChanged = carouselBeatmapsLoaded,
+                                },
+                                Child = Carousel = new BeatmapCarousel
+                                {
+                                    Masking = false,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Size = new Vector2(1 - wedged_container_size.X, 1),
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
+                                    SelectionChanged = updateSelectedBeatmap,
+                                    BeatmapSetsChanged = carouselBeatmapsLoaded,
+                                },
                             },
                             FilterControl = new FilterControl
                             {
                                 RelativeSizeAxes = Axes.X,
-                                Height = 100,
+                                Height = FilterControl.HEIGHT,
                                 FilterChanged = c => Carousel.Filter(c),
                                 Background = { Width = 2 },
                                 Exit = () =>

osu.Game/osu.Game.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.4" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.702.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.723.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.726.2" />
     <PackageReference Include="SharpCompress" Version="0.23.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.iOS.props

@@ -105,8 +105,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.702.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.723.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.726.2" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.723.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.726.2" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />