From 293ef4483609737f34bf5796d0f8fa09b84b177c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Mar 2022 22:43:17 +0100
Subject: [PATCH 01/25] Implement new mod select screen

---
 .../UserInterface/TestSceneModSelectScreen.cs |  28 ++
 osu.Game/Overlays/Mods/ModColumn.cs           |  11 +-
 osu.Game/Overlays/Mods/ModSelectScreen.cs     | 315 ++++++++++++++++++
 osu.Game/Overlays/Mods/ModSettingsArea.cs     |   4 +-
 4 files changed, 356 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
 create mode 100644 osu.Game/Overlays/Mods/ModSelectScreen.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
new file mode 100644
index 0000000000..e6a5784536
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
@@ -0,0 +1,28 @@
+// 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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays.Mods;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    [TestFixture]
+    public class TestSceneModSelectScreen : OsuTestScene
+    {
+        [Test]
+        public void TestModSelectScreen()
+        {
+            ModSelectScreen modSelectScreen = null;
+
+            AddStep("create screen", () => Child = modSelectScreen = new ModSelectScreen
+            {
+                RelativeSizeAxes = Axes.Both,
+                State = { Value = Visibility.Visible }
+            });
+
+            AddToggleStep("toggle state", visible => modSelectScreen.State.Value = visible ? Visibility.Visible : Visibility.Hidden);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 736a0205e2..9cf9e6a268 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -48,6 +48,8 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
+        public Action<Mod, bool>? ModStateChanged { get; set; }
+
         private readonly ModType modType;
         private readonly Key[]? toggleKeys;
 
@@ -251,7 +253,14 @@ namespace osu.Game.Overlays.Mods
                 panelFlow.ChildrenEnumerable = loaded;
 
                 foreach (var panel in panelFlow)
-                    panel.Active.BindValueChanged(_ => updateToggleState());
+                {
+                    panel.Active.BindValueChanged(_ =>
+                    {
+                        updateToggleState();
+                        ModStateChanged?.Invoke(panel.Mod, panel.Active.Value);
+                    });
+                }
+
                 updateToggleState();
 
                 updateFilter();
diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
new file mode 100644
index 0000000000..bd27407965
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -0,0 +1,315 @@
+// 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.Diagnostics;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
+using osu.Framework.Layout;
+using osu.Game.Configuration;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Mods;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class ModSelectScreen : OsuFocusedOverlayContainer
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
+        [Cached]
+        private Bindable<IReadOnlyList<Mod>> selectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
+        private readonly BindableBool customisationVisible = new BindableBool();
+
+        private DifficultyMultiplierDisplay multiplierDisplay;
+        private ModSettingsArea modSettingsArea;
+        private Container columnContainer;
+        private FillFlowContainer<ModColumn> columnFlow;
+        private GridContainer grid;
+        private Container mainContent;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.Both;
+            RelativePositionAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                mainContent = new Container
+                {
+                    Origin = Anchor.BottomCentre,
+                    Anchor = Anchor.BottomCentre,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        grid = new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            RowDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize),
+                                new Dimension(GridSizeMode.AutoSize),
+                                new Dimension(),
+                                new Dimension(GridSizeMode.Absolute, 75),
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new PopupScreenTitle
+                                    {
+                                        Anchor = Anchor.TopCentre,
+                                        Origin = Anchor.TopCentre,
+                                        Title = "Mod Select",
+                                        Description = "Mods provide different ways to enjoy gameplay. Some have an effect on the score you can achieve during ranked play. Others are just for fun.",
+                                        Close = Hide
+                                    }
+                                },
+                                new Drawable[]
+                                {
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Padding = new MarginPadding { Horizontal = 100, Vertical = 10 },
+                                        Child = multiplierDisplay = new DifficultyMultiplierDisplay
+                                        {
+                                            Anchor = Anchor.CentreRight,
+                                            Origin = Anchor.CentreRight
+                                        }
+                                    }
+                                },
+                                new Drawable[]
+                                {
+                                    columnContainer = new Container
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        RelativePositionAxes = Axes.Both,
+                                        X = 1,
+                                        Padding = new MarginPadding { Horizontal = 70 },
+                                        Children = new Drawable[]
+                                        {
+                                            new OsuScrollContainer(Direction.Horizontal)
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Masking = false,
+                                                ScrollbarOverlapsContent = false,
+                                                Child = columnFlow = new ModColumnContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.Y,
+                                                    AutoSizeAxes = Axes.X,
+                                                    Spacing = new Vector2(10, 0),
+                                                    Children = new[]
+                                                    {
+                                                        new ModColumn(ModType.DifficultyReduction, false, new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P }),
+                                                        new ModColumn(ModType.DifficultyIncrease, false, new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L }),
+                                                        new ModColumn(ModType.Automation, false, new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M }),
+                                                        new ModColumn(ModType.Conversion, false),
+                                                        new ModColumn(ModType.Fun, false)
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                },
+                                new[] { Empty() }
+                            }
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Anchor = Anchor.BottomCentre,
+                            Origin = Anchor.BottomCentre,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    Height = 50,
+                                    Anchor = Anchor.BottomCentre,
+                                    Origin = Anchor.BottomCentre,
+                                    Colour = colourProvider.Background5
+                                },
+                                new ShearedToggleButton(200)
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Margin = new MarginPadding { Vertical = 14, Left = 70 },
+                                    Text = "Mod Customisation",
+                                    Active = { BindTarget = customisationVisible }
+                                }
+                            }
+                        },
+                        new ClickToReturnContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            HandleMouse = { BindTarget = customisationVisible },
+                            OnClicked = () => customisationVisible.Value = false
+                        }
+                    }
+                },
+                modSettingsArea = new ModSettingsArea
+                {
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre
+                }
+            };
+
+            foreach (var column in columnFlow)
+            {
+                column.ModStateChanged = (mod, active) => selectedMods.Value = active
+                    ? selectedMods.Value.Append(mod).ToArray()
+                    : selectedMods.Value.Except(new[] { mod }).ToArray();
+            }
+
+            columnFlow.Shear = new Vector2(ModPanel.SHEAR_X, 0);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ((IBindable<IReadOnlyList<Mod>>)modSettingsArea.SelectedMods).BindTo(selectedMods);
+            selectedMods.BindValueChanged(val =>
+            {
+                updateMultiplier();
+                updateCustomisation(val);
+            }, true);
+            customisationVisible.BindValueChanged(_ => updateCustomisationVisualState(), true);
+
+            FinishTransforms(true);
+        }
+
+        private void updateMultiplier()
+        {
+            double multiplier = 1.0;
+
+            foreach (var mod in selectedMods.Value)
+                multiplier *= mod.ScoreMultiplier;
+
+            multiplierDisplay.Current.Value = multiplier;
+        }
+
+        private void updateCustomisation(ValueChangedEvent<IReadOnlyList<Mod>> valueChangedEvent)
+        {
+            bool anyCustomisableMod = false;
+            bool anyModWithRequiredCustomisationAdded = false;
+
+            foreach (var mod in selectedMods.Value)
+            {
+                anyCustomisableMod |= mod.GetSettingsSourceProperties().Any();
+                anyModWithRequiredCustomisationAdded |= !valueChangedEvent.OldValue.Contains(mod) && mod.RequiresConfiguration;
+            }
+
+            if (anyCustomisableMod)
+            {
+                customisationVisible.Disabled = false;
+
+                if (anyModWithRequiredCustomisationAdded && !customisationVisible.Value)
+                    customisationVisible.Value = true;
+            }
+            else
+            {
+                if (customisationVisible.Value)
+                    customisationVisible.Value = false;
+
+                customisationVisible.Disabled = true;
+            }
+        }
+
+        private void updateCustomisationVisualState()
+        {
+            grid.FadeColour(customisationVisible.Value ? Colour4.Gray : Colour4.White, 800, Easing.OutQuint);
+
+            float modAreaHeight = customisationVisible.Value ? ModSettingsArea.HEIGHT : 0;
+
+            modSettingsArea.ResizeHeightTo(modAreaHeight, 800, Easing.InOutCubic);
+            mainContent.TransformTo(nameof(Margin), new MarginPadding { Bottom = modAreaHeight }, 800, Easing.InOutCubic);
+        }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+            this.MoveToY(0, 800, Easing.OutQuint);
+            columnContainer.MoveToX(0, 800, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            base.PopOut();
+            this.MoveToY(1.2f, 800, Easing.OutQuint);
+            columnContainer.MoveToX(1, 800, Easing.OutQuint);
+        }
+
+        private class ModColumnContainer : FillFlowContainer<ModColumn>
+        {
+            private readonly LayoutValue drawSizeLayout = new LayoutValue(Invalidation.DrawSize);
+
+            public ModColumnContainer()
+            {
+                AddLayout(drawSizeLayout);
+            }
+
+            public override void Add(ModColumn column)
+            {
+                base.Add(column);
+
+                Debug.Assert(column != null);
+                column.Shear = Vector2.Zero;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                if (!drawSizeLayout.IsValid)
+                {
+                    Padding = new MarginPadding
+                    {
+                        Left = DrawHeight * ModPanel.SHEAR_X,
+                        Bottom = 10
+                    };
+
+                    drawSizeLayout.Validate();
+                }
+            }
+        }
+
+        private class ClickToReturnContainer : Container
+        {
+            public BindableBool HandleMouse { get; } = new BindableBool();
+
+            public Action OnClicked { get; set; }
+
+            protected override bool Handle(UIEvent e)
+            {
+                if (!HandleMouse.Value)
+                    return base.Handle(e);
+
+                switch (e)
+                {
+                    case ClickEvent _:
+                        OnClicked?.Invoke();
+                        return true;
+
+                    case MouseEvent _:
+                        return true;
+                }
+
+                return base.Handle(e);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModSettingsArea.cs b/osu.Game/Overlays/Mods/ModSettingsArea.cs
index e0a30f60c2..9b0382c6a4 100644
--- a/osu.Game/Overlays/Mods/ModSettingsArea.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsArea.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Overlays.Mods
     {
         public Bindable<IReadOnlyList<Mod>> SelectedMods { get; } = new Bindable<IReadOnlyList<Mod>>();
 
+        public const float HEIGHT = 250;
+
         private readonly Box background;
         private readonly FillFlowContainer modSettingsFlow;
 
@@ -32,7 +34,7 @@ namespace osu.Game.Overlays.Mods
         public ModSettingsArea()
         {
             RelativeSizeAxes = Axes.X;
-            Height = 250;
+            Height = HEIGHT;
 
             Anchor = Anchor.BottomRight;
             Origin = Anchor.BottomRight;

From e46c2df409afe3bcf50e3a8bb40bb8f1bf90d0d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Mar 2022 23:21:17 +0100
Subject: [PATCH 02/25] Add testing for customisation panel show/hide logic

---
 .../UserInterface/TestSceneModSelectScreen.cs | 62 ++++++++++++++++---
 osu.Game/Overlays/Mods/ModSelectScreen.cs     | 16 ++---
 2 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
index e6a5784536..25b2e92c0c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
@@ -1,28 +1,76 @@
 // 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.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestSceneModSelectScreen : OsuTestScene
+    public class TestSceneModSelectScreen : OsuManualInputManagerTestScene
     {
-        [Test]
-        public void TestModSelectScreen()
-        {
-            ModSelectScreen modSelectScreen = null;
+        private ModSelectScreen modSelectScreen;
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
             AddStep("create screen", () => Child = modSelectScreen = new ModSelectScreen
             {
                 RelativeSizeAxes = Axes.Both,
-                State = { Value = Visibility.Visible }
+                State = { Value = Visibility.Visible },
+                SelectedMods = { BindTarget = SelectedMods }
+            });
+        }
+
+        [Test]
+        public void TestStateChange()
+        {
+            AddToggleStep("toggle state", visible => modSelectScreen.State.Value = visible ? Visibility.Visible : Visibility.Hidden);
+        }
+
+        [Test]
+        public void TestCustomisationToggleState()
+        {
+            assertCustomisationToggleState(disabled: true, active: false);
+
+            AddStep("select customisable mod", () => SelectedMods.Value = new[] { new OsuModDoubleTime() });
+            assertCustomisationToggleState(disabled: false, active: false);
+
+            AddStep("select mod requiring configuration", () => SelectedMods.Value = new[] { new OsuModDifficultyAdjust() });
+            assertCustomisationToggleState(disabled: false, active: true);
+
+            AddStep("dismiss mod customisation", () =>
+            {
+                InputManager.MoveMouseTo(modSelectScreen.ChildrenOfType<ShearedToggleButton>().Single());
+                InputManager.Click(MouseButton.Left);
             });
 
-            AddToggleStep("toggle state", visible => modSelectScreen.State.Value = visible ? Visibility.Visible : Visibility.Hidden);
+            AddStep("append another mod not requiring config", () => SelectedMods.Value = SelectedMods.Value.Append(new OsuModFlashlight()).ToArray());
+            assertCustomisationToggleState(disabled: false, active: false);
+
+            AddStep("select mod without configuration", () => SelectedMods.Value = new[] { new OsuModAutoplay() });
+            assertCustomisationToggleState(disabled: true, active: false);
+
+            AddStep("select mod requiring configuration", () => SelectedMods.Value = new[] { new OsuModDifficultyAdjust() });
+            assertCustomisationToggleState(disabled: false, active: true);
+
+            AddStep("select mod without configuration", () => SelectedMods.Value = new[] { new OsuModAutoplay() });
+            assertCustomisationToggleState(disabled: true, active: false); // config was dismissed without explicit user action.
+        }
+
+        private void assertCustomisationToggleState(bool disabled, bool active)
+        {
+            ShearedToggleButton getToggle() => modSelectScreen.ChildrenOfType<ShearedToggleButton>().Single();
+
+            AddAssert($"customisation toggle is {(disabled ? "" : "not ")}disabled", () => getToggle().Active.Disabled == disabled);
+            AddAssert($"customisation toggle is {(active ? "" : "not ")}active", () => getToggle().Active.Value == active);
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index bd27407965..0a9b1ddbcb 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Mods
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
         [Cached]
-        private Bindable<IReadOnlyList<Mod>> selectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+        public Bindable<IReadOnlyList<Mod>> SelectedMods { get; private set; } = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         private readonly BindableBool customisationVisible = new BindableBool();
 
@@ -169,9 +169,9 @@ namespace osu.Game.Overlays.Mods
 
             foreach (var column in columnFlow)
             {
-                column.ModStateChanged = (mod, active) => selectedMods.Value = active
-                    ? selectedMods.Value.Append(mod).ToArray()
-                    : selectedMods.Value.Except(new[] { mod }).ToArray();
+                column.ModStateChanged = (mod, active) => SelectedMods.Value = active
+                    ? SelectedMods.Value.Append(mod).ToArray()
+                    : SelectedMods.Value.Except(new[] { mod }).ToArray();
             }
 
             columnFlow.Shear = new Vector2(ModPanel.SHEAR_X, 0);
@@ -181,8 +181,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            ((IBindable<IReadOnlyList<Mod>>)modSettingsArea.SelectedMods).BindTo(selectedMods);
-            selectedMods.BindValueChanged(val =>
+            ((IBindable<IReadOnlyList<Mod>>)modSettingsArea.SelectedMods).BindTo(SelectedMods);
+            SelectedMods.BindValueChanged(val =>
             {
                 updateMultiplier();
                 updateCustomisation(val);
@@ -196,7 +196,7 @@ namespace osu.Game.Overlays.Mods
         {
             double multiplier = 1.0;
 
-            foreach (var mod in selectedMods.Value)
+            foreach (var mod in SelectedMods.Value)
                 multiplier *= mod.ScoreMultiplier;
 
             multiplierDisplay.Current.Value = multiplier;
@@ -207,7 +207,7 @@ namespace osu.Game.Overlays.Mods
             bool anyCustomisableMod = false;
             bool anyModWithRequiredCustomisationAdded = false;
 
-            foreach (var mod in selectedMods.Value)
+            foreach (var mod in SelectedMods.Value)
             {
                 anyCustomisableMod |= mod.GetSettingsSourceProperties().Any();
                 anyModWithRequiredCustomisationAdded |= !valueChangedEvent.OldValue.Contains(mod) && mod.RequiresConfiguration;

From 2921a1360917b915852e678bed4b453c9e777235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 3 Apr 2022 17:43:13 +0200
Subject: [PATCH 03/25] Add testing for mod bindable state propagation

---
 .../UserInterface/TestSceneModSelectScreen.cs | 46 ++++++++++++++++---
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
index 25b2e92c0c..a5f5048961 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
@@ -6,8 +6,10 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
 using osuTK.Input;
 
@@ -21,23 +23,55 @@ namespace osu.Game.Tests.Visual.UserInterface
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("create screen", () => Child = modSelectScreen = new ModSelectScreen
-            {
-                RelativeSizeAxes = Axes.Both,
-                State = { Value = Visibility.Visible },
-                SelectedMods = { BindTarget = SelectedMods }
-            });
+            AddStep("reset mods", () => SelectedMods.SetDefault());
         }
 
+        private void createScreen() => AddStep("create screen", () => Child = modSelectScreen = new ModSelectScreen
+        {
+            RelativeSizeAxes = Axes.Both,
+            State = { Value = Visibility.Visible },
+            SelectedMods = { BindTarget = SelectedMods }
+        });
+
         [Test]
         public void TestStateChange()
         {
+            createScreen();
             AddToggleStep("toggle state", visible => modSelectScreen.State.Value = visible ? Visibility.Visible : Visibility.Hidden);
         }
 
+        [Test]
+        public void TestPreexistingSelection()
+        {
+            AddStep("set mods", () => SelectedMods.Value = new Mod[] { new OsuModAlternate(), new OsuModDaycore() });
+            createScreen();
+            AddUntilStep("two panels active", () => modSelectScreen.ChildrenOfType<ModPanel>().Count(panel => panel.Active.Value) == 2);
+            AddAssert("mod multiplier correct", () =>
+            {
+                double multiplier = SelectedMods.Value.Aggregate(1d, (multiplier, mod) => multiplier * mod.ScoreMultiplier);
+                return Precision.AlmostEquals(multiplier, modSelectScreen.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value);
+            });
+            assertCustomisationToggleState(disabled: false, active: false);
+        }
+
+        [Test]
+        public void TestExternalSelection()
+        {
+            createScreen();
+            AddStep("set mods", () => SelectedMods.Value = new Mod[] { new OsuModAlternate(), new OsuModDaycore() });
+            AddUntilStep("two panels active", () => modSelectScreen.ChildrenOfType<ModPanel>().Count(panel => panel.Active.Value) == 2);
+            AddAssert("mod multiplier correct", () =>
+            {
+                double multiplier = SelectedMods.Value.Aggregate(1d, (multiplier, mod) => multiplier * mod.ScoreMultiplier);
+                return Precision.AlmostEquals(multiplier, modSelectScreen.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value);
+            });
+            assertCustomisationToggleState(disabled: false, active: false);
+        }
+
         [Test]
         public void TestCustomisationToggleState()
         {
+            createScreen();
             assertCustomisationToggleState(disabled: true, active: false);
 
             AddStep("select customisable mod", () => SelectedMods.Value = new[] { new OsuModDoubleTime() });

From cd776d21a6c5268277644bebd1fe3336cb75dbdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Mar 2022 00:16:10 +0200
Subject: [PATCH 04/25] Fix propagation of selected mods to columns

---
 osu.Game/Overlays/Mods/ModColumn.cs       | 43 +++++++++++++++--------
 osu.Game/Overlays/Mods/ModSelectScreen.cs | 42 ++++++++++++++++++----
 2 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 9cf9e6a268..46a562ac98 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Overlays.Mods
 {
     public class ModColumn : CompositeDrawable
     {
+        public readonly ModType ModType;
+
         private Func<Mod, bool>? filter;
 
         /// <summary>
@@ -48,9 +50,8 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        public Action<Mod, bool>? ModStateChanged { get; set; }
+        public Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
-        private readonly ModType modType;
         private readonly Key[]? toggleKeys;
 
         private readonly Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> availableMods = new Bindable<Dictionary<ModType, IReadOnlyList<Mod>>>();
@@ -71,7 +72,7 @@ namespace osu.Game.Overlays.Mods
 
         public ModColumn(ModType modType, bool allowBulkSelection, Key[]? toggleKeys = null)
         {
-            this.modType = modType;
+            ModType = modType;
             this.toggleKeys = toggleKeys;
 
             Width = 320;
@@ -195,7 +196,7 @@ namespace osu.Game.Overlays.Mods
 
         private void createHeaderText()
         {
-            IEnumerable<string> headerTextWords = modType.Humanize(LetterCasing.Title).Split(' ');
+            IEnumerable<string> headerTextWords = ModType.Humanize(LetterCasing.Title).Split(' ');
 
             if (headerTextWords.Count() > 1)
             {
@@ -211,7 +212,7 @@ namespace osu.Game.Overlays.Mods
         {
             availableMods.BindTo(game.AvailableMods);
 
-            headerBackground.Colour = accentColour = colours.ForModType(modType);
+            headerBackground.Colour = accentColour = colours.ForModType(ModType);
 
             if (toggleAllCheckbox != null)
             {
@@ -227,6 +228,12 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
             availableMods.BindValueChanged(_ => Scheduler.AddOnce(updateMods));
+            SelectedMods.BindValueChanged(_ =>
+            {
+                // if a load is in progress, don't try to update the selection - the load flow will do so.
+                if (latestLoadTask == null)
+                    updateActiveState();
+            });
             updateMods();
         }
 
@@ -234,7 +241,7 @@ namespace osu.Game.Overlays.Mods
 
         private void updateMods()
         {
-            var newMods = ModUtils.FlattenMods(availableMods.Value.GetValueOrDefault(modType) ?? Array.Empty<Mod>()).ToList();
+            var newMods = ModUtils.FlattenMods(availableMods.Value.GetValueOrDefault(ModType) ?? Array.Empty<Mod>()).ToList();
 
             if (newMods.SequenceEqual(panelFlow.Children.Select(p => p.Mod)))
                 return;
@@ -252,18 +259,20 @@ namespace osu.Game.Overlays.Mods
             {
                 panelFlow.ChildrenEnumerable = loaded;
 
+                updateActiveState();
+                updateToggleAllState();
+                updateFilter();
+
                 foreach (var panel in panelFlow)
                 {
                     panel.Active.BindValueChanged(_ =>
                     {
-                        updateToggleState();
-                        ModStateChanged?.Invoke(panel.Mod, panel.Active.Value);
+                        updateToggleAllState();
+                        SelectedMods.Value = panel.Active.Value
+                            ? SelectedMods.Value.Append(panel.Mod).ToArray()
+                            : SelectedMods.Value.Except(new[] { panel.Mod }).ToArray();
                     });
                 }
-
-                updateToggleState();
-
-                updateFilter();
             }, (cancellationTokenSource = new CancellationTokenSource()).Token);
             loadTask.ContinueWith(_ =>
             {
@@ -272,6 +281,12 @@ namespace osu.Game.Overlays.Mods
             });
         }
 
+        private void updateActiveState()
+        {
+            foreach (var panel in panelFlow)
+                panel.Active.Value = SelectedMods.Value.Contains(panel.Mod, EqualityComparer<Mod>.Default);
+        }
+
         #region Bulk select / deselect
 
         private const double initial_multiple_selection_delay = 120;
@@ -306,7 +321,7 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        private void updateToggleState()
+        private void updateToggleAllState()
         {
             if (toggleAllCheckbox != null && !SelectionAnimationRunning)
             {
@@ -408,7 +423,7 @@ namespace osu.Game.Overlays.Mods
             foreach (var modPanel in panelFlow)
                 modPanel.ApplyFilter(Filter);
 
-            updateToggleState();
+            updateToggleAllState();
         }
 
         #endregion
diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index 0a9b1ddbcb..659c88e070 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -167,13 +167,6 @@ namespace osu.Game.Overlays.Mods
                 }
             };
 
-            foreach (var column in columnFlow)
-            {
-                column.ModStateChanged = (mod, active) => SelectedMods.Value = active
-                    ? SelectedMods.Value.Append(mod).ToArray()
-                    : SelectedMods.Value.Except(new[] { mod }).ToArray();
-            }
-
             columnFlow.Shear = new Vector2(ModPanel.SHEAR_X, 0);
         }
 
@@ -182,11 +175,19 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             ((IBindable<IReadOnlyList<Mod>>)modSettingsArea.SelectedMods).BindTo(SelectedMods);
+
             SelectedMods.BindValueChanged(val =>
             {
                 updateMultiplier();
                 updateCustomisation(val);
+                updateSelectionFromBindable();
             }, true);
+
+            foreach (var column in columnFlow)
+            {
+                column.SelectedMods.BindValueChanged(_ => updateBindableFromSelection());
+            }
+
             customisationVisible.BindValueChanged(_ => updateCustomisationVisualState(), true);
 
             FinishTransforms(true);
@@ -239,6 +240,33 @@ namespace osu.Game.Overlays.Mods
             mainContent.TransformTo(nameof(Margin), new MarginPadding { Bottom = modAreaHeight }, 800, Easing.InOutCubic);
         }
 
+        private bool selectionBindableSyncInProgress;
+
+        private void updateSelectionFromBindable()
+        {
+            if (selectionBindableSyncInProgress)
+                return;
+
+            selectionBindableSyncInProgress = true;
+
+            foreach (var column in columnFlow)
+                column.SelectedMods.Value = SelectedMods.Value.Where(mod => mod.Type == column.ModType).ToArray();
+
+            selectionBindableSyncInProgress = false;
+        }
+
+        private void updateBindableFromSelection()
+        {
+            if (selectionBindableSyncInProgress)
+                return;
+
+            selectionBindableSyncInProgress = true;
+
+            SelectedMods.Value = columnFlow.SelectMany(column => column.SelectedMods.Value).ToArray();
+
+            selectionBindableSyncInProgress = false;
+        }
+
         protected override void PopIn()
         {
             base.PopIn();

From a172b194f0a97d546e7af99ee34f93512cb8c594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 3 Apr 2022 18:38:23 +0200
Subject: [PATCH 05/25] Add testing for different rulesets

---
 .../UserInterface/TestSceneModSelectScreen.cs      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
index a5f5048961..0d568cd030 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
@@ -9,8 +9,12 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Taiko;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -68,6 +72,16 @@ namespace osu.Game.Tests.Visual.UserInterface
             assertCustomisationToggleState(disabled: false, active: false);
         }
 
+        [Test]
+        public void TestRulesetChange()
+        {
+            createScreen();
+            AddStep("change to osu!", () => Ruleset.Value = new OsuRuleset().RulesetInfo);
+            AddStep("change to osu!taiko", () => Ruleset.Value = new TaikoRuleset().RulesetInfo);
+            AddStep("change to osu!catch", () => Ruleset.Value = new CatchRuleset().RulesetInfo);
+            AddStep("change to osu!mania", () => Ruleset.Value = new ManiaRuleset().RulesetInfo);
+        }
+
         [Test]
         public void TestCustomisationToggleState()
         {

From 90e44b67ea0c883128e7e2fe11da91e2e18101e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 3 Apr 2022 20:24:32 +0200
Subject: [PATCH 06/25] Improve robustness of test code

---
 .../UserInterface/TestSceneModSelectScreen.cs | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
index 0d568cd030..47cff40873 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
@@ -3,18 +3,16 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
-using osu.Game.Rulesets.Catch;
-using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Rulesets.Taiko;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
@@ -22,20 +20,29 @@ namespace osu.Game.Tests.Visual.UserInterface
     [TestFixture]
     public class TestSceneModSelectScreen : OsuManualInputManagerTestScene
     {
+        [Resolved]
+        private RulesetStore rulesetStore { get; set; }
+
         private ModSelectScreen modSelectScreen;
 
         [SetUpSteps]
         public void SetUpSteps()
         {
+            AddStep("clear contents", Clear);
+            AddStep("reset ruleset", () => Ruleset.Value = rulesetStore.GetRuleset(0));
             AddStep("reset mods", () => SelectedMods.SetDefault());
         }
 
-        private void createScreen() => AddStep("create screen", () => Child = modSelectScreen = new ModSelectScreen
+        private void createScreen()
         {
-            RelativeSizeAxes = Axes.Both,
-            State = { Value = Visibility.Visible },
-            SelectedMods = { BindTarget = SelectedMods }
-        });
+            AddStep("create screen", () => Child = modSelectScreen = new ModSelectScreen
+            {
+                RelativeSizeAxes = Axes.Both,
+                State = { Value = Visibility.Visible },
+                SelectedMods = { BindTarget = SelectedMods }
+            });
+            waitForColumnLoad();
+        }
 
         [Test]
         public void TestStateChange()
@@ -76,10 +83,10 @@ namespace osu.Game.Tests.Visual.UserInterface
         public void TestRulesetChange()
         {
             createScreen();
-            AddStep("change to osu!", () => Ruleset.Value = new OsuRuleset().RulesetInfo);
-            AddStep("change to osu!taiko", () => Ruleset.Value = new TaikoRuleset().RulesetInfo);
-            AddStep("change to osu!catch", () => Ruleset.Value = new CatchRuleset().RulesetInfo);
-            AddStep("change to osu!mania", () => Ruleset.Value = new ManiaRuleset().RulesetInfo);
+            changeRuleset(0);
+            changeRuleset(1);
+            changeRuleset(2);
+            changeRuleset(3);
         }
 
         [Test]
@@ -113,6 +120,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             assertCustomisationToggleState(disabled: true, active: false); // config was dismissed without explicit user action.
         }
 
+        private void waitForColumnLoad() => AddUntilStep("all column content loaded",
+            () => modSelectScreen.ChildrenOfType<ModColumn>().Any() && modSelectScreen.ChildrenOfType<ModColumn>().All(column => column.IsLoaded && column.ItemsLoaded));
+
+        private void changeRuleset(int id)
+        {
+            AddStep($"set ruleset to {id}", () => Ruleset.Value = rulesetStore.GetRuleset(id));
+            waitForColumnLoad();
+        }
+
         private void assertCustomisationToggleState(bool disabled, bool active)
         {
             ShearedToggleButton getToggle() => modSelectScreen.ChildrenOfType<ShearedToggleButton>().Single();

From 3ba81f3fdce3791d50f526849a320919a1e9d9fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Apr 2022 15:29:03 +0900
Subject: [PATCH 07/25] Fix overlapping variable usage

---
 .../Visual/UserInterface/TestSceneModSelectScreen.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
index 47cff40873..1e9357b6c4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("two panels active", () => modSelectScreen.ChildrenOfType<ModPanel>().Count(panel => panel.Active.Value) == 2);
             AddAssert("mod multiplier correct", () =>
             {
-                double multiplier = SelectedMods.Value.Aggregate(1d, (multiplier, mod) => multiplier * mod.ScoreMultiplier);
+                double multiplier = SelectedMods.Value.Aggregate(1d, (m, mod) => m * mod.ScoreMultiplier);
                 return Precision.AlmostEquals(multiplier, modSelectScreen.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value);
             });
             assertCustomisationToggleState(disabled: false, active: false);
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("two panels active", () => modSelectScreen.ChildrenOfType<ModPanel>().Count(panel => panel.Active.Value) == 2);
             AddAssert("mod multiplier correct", () =>
             {
-                double multiplier = SelectedMods.Value.Aggregate(1d, (multiplier, mod) => multiplier * mod.ScoreMultiplier);
+                double multiplier = SelectedMods.Value.Aggregate(1d, (m, mod) => m * mod.ScoreMultiplier);
                 return Precision.AlmostEquals(multiplier, modSelectScreen.ChildrenOfType<DifficultyMultiplierDisplay>().Single().Current.Value);
             });
             assertCustomisationToggleState(disabled: false, active: false);

From b5df3500079489c969ba95666a7c94c0cf977d41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Apr 2022 15:45:44 +0900
Subject: [PATCH 08/25] Adjust pop in/out transitions

---
 osu.Game/Overlays/Mods/ModSelectScreen.cs | 26 +++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index 659c88e070..fb991f60ba 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -38,6 +38,9 @@ namespace osu.Game.Overlays.Mods
         private GridContainer grid;
         private Container mainContent;
 
+        private PopupScreenTitle header;
+        private Container footer;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -67,7 +70,7 @@ namespace osu.Game.Overlays.Mods
                             {
                                 new Drawable[]
                                 {
-                                    new PopupScreenTitle
+                                    header = new PopupScreenTitle
                                     {
                                         Anchor = Anchor.TopCentre,
                                         Origin = Anchor.TopCentre,
@@ -96,7 +99,6 @@ namespace osu.Game.Overlays.Mods
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         RelativePositionAxes = Axes.Both,
-                                        X = 1,
                                         Padding = new MarginPadding { Horizontal = 70 },
                                         Children = new Drawable[]
                                         {
@@ -126,7 +128,7 @@ namespace osu.Game.Overlays.Mods
                                 new[] { Empty() }
                             }
                         },
-                        new Container
+                        footer = new Container
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
@@ -269,16 +271,26 @@ namespace osu.Game.Overlays.Mods
 
         protected override void PopIn()
         {
+            const double fade_in_duration = 500;
+
             base.PopIn();
-            this.MoveToY(0, 800, Easing.OutQuint);
-            columnContainer.MoveToX(0, 800, Easing.OutQuint);
+
+            header.MoveToY(0, fade_in_duration, Easing.OutQuint);
+            footer.MoveToY(0, fade_in_duration, Easing.OutQuint);
+
+            this.FadeIn(fade_in_duration, Easing.OutQuint);
         }
 
         protected override void PopOut()
         {
+            const double fade_out_duration = 500;
+
             base.PopOut();
-            this.MoveToY(1.2f, 800, Easing.OutQuint);
-            columnContainer.MoveToX(1, 800, Easing.OutQuint);
+
+            header.MoveToY(-header.DrawHeight, fade_out_duration, Easing.OutQuint);
+            footer.MoveToY(footer.DrawHeight, fade_out_duration, Easing.OutQuint);
+
+            this.FadeOut(fade_out_duration, Easing.OutQuint);
         }
 
         private class ModColumnContainer : FillFlowContainer<ModColumn>

From bc53adb72a14e5bbc16d320243a76388d2cc063e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Apr 2022 15:50:40 +0900
Subject: [PATCH 09/25] Adjust customisation transition slightly

---
 osu.Game/Overlays/Mods/ModSelectScreen.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index fb991f60ba..b3435affff 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -234,12 +234,14 @@ namespace osu.Game.Overlays.Mods
 
         private void updateCustomisationVisualState()
         {
-            grid.FadeColour(customisationVisible.Value ? Colour4.Gray : Colour4.White, 800, Easing.OutQuint);
+            const double transition_duration = 700;
+
+            grid.FadeColour(customisationVisible.Value ? Colour4.Gray : Colour4.White, transition_duration, Easing.InOutCubic);
 
             float modAreaHeight = customisationVisible.Value ? ModSettingsArea.HEIGHT : 0;
 
-            modSettingsArea.ResizeHeightTo(modAreaHeight, 800, Easing.InOutCubic);
-            mainContent.TransformTo(nameof(Margin), new MarginPadding { Bottom = modAreaHeight }, 800, Easing.InOutCubic);
+            modSettingsArea.ResizeHeightTo(modAreaHeight, transition_duration, Easing.InOutCubic);
+            mainContent.TransformTo(nameof(Margin), new MarginPadding { Bottom = modAreaHeight }, transition_duration, Easing.InOutCubic);
         }
 
         private bool selectionBindableSyncInProgress;

From 57b8c32f253f94df284fe1a9c9b4b739f9b4ac54 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Apr 2022 20:42:12 +0900
Subject: [PATCH 10/25] Remove unused fields

---
 osu.Game/Overlays/Mods/ModSelectScreen.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index b3435affff..8baf141c61 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -33,7 +33,6 @@ namespace osu.Game.Overlays.Mods
 
         private DifficultyMultiplierDisplay multiplierDisplay;
         private ModSettingsArea modSettingsArea;
-        private Container columnContainer;
         private FillFlowContainer<ModColumn> columnFlow;
         private GridContainer grid;
         private Container mainContent;
@@ -95,7 +94,7 @@ namespace osu.Game.Overlays.Mods
                                 },
                                 new Drawable[]
                                 {
-                                    columnContainer = new Container
+                                    new Container
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         RelativePositionAxes = Axes.Both,

From 9b367d645d464bfcdeec61742de7768b928a8f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Apr 2022 20:02:47 +0200
Subject: [PATCH 11/25] Always play pop in sequence

---
 osu.Game/Overlays/Mods/ModSelectScreen.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index 8baf141c61..7915fb755c 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Overlays.Mods
         [Cached]
         public Bindable<IReadOnlyList<Mod>> SelectedMods { get; private set; } = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
+        protected override bool StartHidden => true;
+
         private readonly BindableBool customisationVisible = new BindableBool();
 
         private DifficultyMultiplierDisplay multiplierDisplay;
@@ -164,7 +166,8 @@ namespace osu.Game.Overlays.Mods
                 modSettingsArea = new ModSettingsArea
                 {
                     Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre
+                    Origin = Anchor.BottomCentre,
+                    Height = 0
                 }
             };
 
@@ -190,8 +193,6 @@ namespace osu.Game.Overlays.Mods
             }
 
             customisationVisible.BindValueChanged(_ => updateCustomisationVisualState(), true);
-
-            FinishTransforms(true);
         }
 
         private void updateMultiplier()

From 29b7460cc7454a8b4371c72f2f30858a04b146c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 4 Apr 2022 20:05:54 +0200
Subject: [PATCH 12/25] Fix weird test step

---
 osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
index 1e9357b6c4..34d9ddcc4e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectScreen.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         public void TestStateChange()
         {
             createScreen();
-            AddToggleStep("toggle state", visible => modSelectScreen.State.Value = visible ? Visibility.Visible : Visibility.Hidden);
+            AddStep("toggle state", () => modSelectScreen.ToggleVisibility());
         }
 
         [Test]

From 23dad7bdc4cab9bbbac3f8c707c17f2d23eb2c53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 16:39:02 +0900
Subject: [PATCH 13/25] Move scroll view padding to content level

Without doing this, there is a non-masked but also non-interactive area
to the left or right of the view.
---
 osu.Game/Overlays/Mods/ModSelectScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index 7915fb755c..5197cb6c3e 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -100,7 +100,6 @@ namespace osu.Game.Overlays.Mods
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         RelativePositionAxes = Axes.Both,
-                                        Padding = new MarginPadding { Horizontal = 70 },
                                         Children = new Drawable[]
                                         {
                                             new OsuScrollContainer(Direction.Horizontal)
@@ -113,6 +112,7 @@ namespace osu.Game.Overlays.Mods
                                                     RelativeSizeAxes = Axes.Y,
                                                     AutoSizeAxes = Axes.X,
                                                     Spacing = new Vector2(10, 0),
+                                                    Margin = new MarginPadding { Horizontal = 70 },
                                                     Children = new[]
                                                     {
                                                         new ModColumn(ModType.DifficultyReduction, false, new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P }),

From f156cb797df13c31e43856e58037cec9b490bf7d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 16:40:09 +0900
Subject: [PATCH 14/25] Improve nested scroll behaviour

---
 osu.Game/Overlays/Mods/ModColumn.cs       | 60 ++++++++++++++++++++++-
 osu.Game/Overlays/Mods/ModSelectScreen.cs |  1 +
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 46a562ac98..513dd2ca3f 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -151,9 +151,10 @@ namespace osu.Game.Overlays.Mods
                                     },
                                     new Drawable[]
                                     {
-                                        new OsuScrollContainer
+                                        new NestedVerticalScrollContainer
                                         {
                                             RelativeSizeAxes = Axes.Both,
+                                            ClampExtension = 100,
                                             ScrollbarOverlapsContent = false,
                                             Child = panelFlow = new FillFlowContainer<ModPanel>
                                             {
@@ -194,6 +195,63 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
+        /// <summary>
+        /// A scroll container that handles the case of vertically scrolling content inside a larger horizontally scrolling parent container.
+        /// </summary>
+        private class NestedVerticalScrollContainer : OsuScrollContainer
+        {
+            private OsuScrollContainer? parentScrollContainer;
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                parentScrollContainer = findClosestParent<OsuScrollContainer>();
+            }
+
+            protected override bool OnScroll(ScrollEvent e)
+            {
+                if (parentScrollContainer == null)
+                    return base.OnScroll(e);
+
+                // If not on screen, handle scroll but also allow parent to scroll at the same time.
+                bool topRightOutsideOfView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.TopRight) == false;
+                bool bottomLeftOutsideOfView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.BottomLeft) == false;
+
+                if (topRightOutsideOfView || bottomLeftOutsideOfView)
+                {
+                    base.OnScroll(e);
+                    return false;
+                }
+
+                bool scrollingPastEnd = e.ScrollDelta.Y < 0 && IsScrolledToEnd();
+                bool scrollingPastStart = e.ScrollDelta.Y > 0 && Target <= 0;
+
+                // Same deal if at one of the two extents of the view.
+                if (scrollingPastStart || scrollingPastEnd)
+                {
+                    base.OnScroll(e);
+                    return false;
+                }
+
+                return base.OnScroll(e);
+            }
+
+            // TODO: remove when https://github.com/ppy/osu-framework/pull/5092 is available.
+            private T? findClosestParent<T>() where T : class, IDrawable
+            {
+                Drawable cursor = this;
+
+                while ((cursor = cursor.Parent) != null)
+                {
+                    if (cursor is T match)
+                        return match;
+                }
+
+                return default;
+            }
+        }
+
         private void createHeaderText()
         {
             IEnumerable<string> headerTextWords = ModType.Humanize(LetterCasing.Title).Split(' ');
diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index 5197cb6c3e..1d6f784133 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -106,6 +106,7 @@ namespace osu.Game.Overlays.Mods
                                             {
                                                 RelativeSizeAxes = Axes.Both,
                                                 Masking = false,
+                                                ClampExtension = 100,
                                                 ScrollbarOverlapsContent = false,
                                                 Child = columnFlow = new ModColumnContainer
                                                 {

From 58e9147b12a613e6ae2dc590d82f5672304963b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 16:48:25 +0900
Subject: [PATCH 15/25] Simplify and better comment nested scroll conditionals

---
 osu.Game/Overlays/Mods/ModColumn.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 513dd2ca3f..e915e88e99 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -214,11 +214,11 @@ namespace osu.Game.Overlays.Mods
                 if (parentScrollContainer == null)
                     return base.OnScroll(e);
 
-                // If not on screen, handle scroll but also allow parent to scroll at the same time.
-                bool topRightOutsideOfView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.TopRight) == false;
-                bool bottomLeftOutsideOfView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.BottomLeft) == false;
+                bool topRightInView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.TopRight);
+                bool bottomLeftInView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.BottomLeft);
 
-                if (topRightOutsideOfView || bottomLeftOutsideOfView)
+                // If not completely on-screen, handle scroll but also allow parent to scroll at the same time (to hopefully bring our content into full view).
+                if (!topRightInView || !bottomLeftInView)
                 {
                     base.OnScroll(e);
                     return false;
@@ -227,7 +227,7 @@ namespace osu.Game.Overlays.Mods
                 bool scrollingPastEnd = e.ScrollDelta.Y < 0 && IsScrolledToEnd();
                 bool scrollingPastStart = e.ScrollDelta.Y > 0 && Target <= 0;
 
-                // Same deal if at one of the two extents of the view.
+                // If at either of our extents, allow the parent scroll to handle as a horizontal scroll to view more content.
                 if (scrollingPastStart || scrollingPastEnd)
                 {
                     base.OnScroll(e);

From 388322cd61eeec61aa7bc53597f49b4c0f463619 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 16:56:24 +0900
Subject: [PATCH 16/25] Speed up customisation panel toggle a bit

---
 osu.Game/Overlays/Mods/ModSelectScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index 1d6f784133..1f0dcea6c2 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -235,7 +235,7 @@ namespace osu.Game.Overlays.Mods
 
         private void updateCustomisationVisualState()
         {
-            const double transition_duration = 700;
+            const double transition_duration = 300;
 
             grid.FadeColour(customisationVisible.Value ? Colour4.Gray : Colour4.White, transition_duration, Easing.InOutCubic);
 

From a408776734b8d7285d8f1af98560dae8405aeb09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 17:14:59 +0900
Subject: [PATCH 17/25] Limit `FillFlow` of columns to applicable direction

---
 osu.Game/Overlays/Mods/ModSelectScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index 1f0dcea6c2..8468448bbb 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -110,6 +110,7 @@ namespace osu.Game.Overlays.Mods
                                                 ScrollbarOverlapsContent = false,
                                                 Child = columnFlow = new ModColumnContainer
                                                 {
+                                                    Direction = FillDirection.Horizontal,
                                                     RelativeSizeAxes = Axes.Y,
                                                     AutoSizeAxes = Axes.X,
                                                     Spacing = new Vector2(10, 0),

From 497e5e3a36731490881e8afe3da2cd087446b197 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 17:15:24 +0900
Subject: [PATCH 18/25] Slightly adjust scroll handling and also apply to
 `ModSettingsContainer`

---
 osu.Game/Overlays/Mods/ModColumn.cs           | 57 -----------------
 osu.Game/Overlays/Mods/ModSettingsArea.cs     |  4 +-
 .../Mods/NestedVerticalScrollContainer.cs     | 61 +++++++++++++++++++
 3 files changed, 64 insertions(+), 58 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index e915e88e99..8531ae1e3f 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -195,63 +195,6 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        /// <summary>
-        /// A scroll container that handles the case of vertically scrolling content inside a larger horizontally scrolling parent container.
-        /// </summary>
-        private class NestedVerticalScrollContainer : OsuScrollContainer
-        {
-            private OsuScrollContainer? parentScrollContainer;
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                parentScrollContainer = findClosestParent<OsuScrollContainer>();
-            }
-
-            protected override bool OnScroll(ScrollEvent e)
-            {
-                if (parentScrollContainer == null)
-                    return base.OnScroll(e);
-
-                bool topRightInView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.TopRight);
-                bool bottomLeftInView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.BottomLeft);
-
-                // If not completely on-screen, handle scroll but also allow parent to scroll at the same time (to hopefully bring our content into full view).
-                if (!topRightInView || !bottomLeftInView)
-                {
-                    base.OnScroll(e);
-                    return false;
-                }
-
-                bool scrollingPastEnd = e.ScrollDelta.Y < 0 && IsScrolledToEnd();
-                bool scrollingPastStart = e.ScrollDelta.Y > 0 && Target <= 0;
-
-                // If at either of our extents, allow the parent scroll to handle as a horizontal scroll to view more content.
-                if (scrollingPastStart || scrollingPastEnd)
-                {
-                    base.OnScroll(e);
-                    return false;
-                }
-
-                return base.OnScroll(e);
-            }
-
-            // TODO: remove when https://github.com/ppy/osu-framework/pull/5092 is available.
-            private T? findClosestParent<T>() where T : class, IDrawable
-            {
-                Drawable cursor = this;
-
-                while ((cursor = cursor.Parent) != null)
-                {
-                    if (cursor is T match)
-                        return match;
-                }
-
-                return default;
-            }
-        }
-
         private void createHeaderText()
         {
             IEnumerable<string> headerTextWords = ModType.Humanize(LetterCasing.Title).Split(' ');
diff --git a/osu.Game/Overlays/Mods/ModSettingsArea.cs b/osu.Game/Overlays/Mods/ModSettingsArea.cs
index 9b0382c6a4..be72c1e3e3 100644
--- a/osu.Game/Overlays/Mods/ModSettingsArea.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsArea.cs
@@ -54,6 +54,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         RelativeSizeAxes = Axes.Both,
                         ScrollbarOverlapsContent = false,
+                        ClampExtension = 100,
                         Child = modSettingsFlow = new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.X,
@@ -157,9 +158,10 @@ namespace osu.Game.Overlays.Mods
                         new[] { Empty() },
                         new Drawable[]
                         {
-                            new OsuScrollContainer(Direction.Vertical)
+                            new NestedVerticalScrollContainer
                             {
                                 RelativeSizeAxes = Axes.Both,
+                                ClampExtension = 100,
                                 Child = new FillFlowContainer
                                 {
                                     RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs b/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
new file mode 100644
index 0000000000..c62b52ef27
--- /dev/null
+++ b/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
@@ -0,0 +1,61 @@
+// 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.
+
+#nullable enable
+using osu.Framework.Graphics;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Overlays.Mods
+{
+    /// <summary>
+    /// A scroll container that handles the case of vertically scrolling content inside a larger horizontally scrolling parent container.
+    /// </summary>
+    public class NestedVerticalScrollContainer : OsuScrollContainer
+    {
+        private OsuScrollContainer? parentScrollContainer;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            parentScrollContainer = findClosestParent<OsuScrollContainer>();
+        }
+
+        protected override bool OnScroll(ScrollEvent e)
+        {
+            if (parentScrollContainer == null)
+                return base.OnScroll(e);
+
+            bool topRightInView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.TopRight);
+            bool bottomLeftInView = parentScrollContainer.ScreenSpaceDrawQuad.Contains(ScreenSpaceDrawQuad.BottomLeft);
+
+            // If not completely on-screen, handle scroll but also allow parent to scroll at the same time (to hopefully bring our content into full view).
+            if (!topRightInView || !bottomLeftInView)
+                return false;
+
+            bool scrollingPastEnd = e.ScrollDelta.Y < 0 && IsScrolledToEnd();
+            bool scrollingPastStart = e.ScrollDelta.Y > 0 && Target <= 0;
+
+            // If at either of our extents, delegate scroll to the horizontal parent container.
+            if (scrollingPastStart || scrollingPastEnd)
+                return false;
+
+            return base.OnScroll(e);
+        }
+
+        // TODO: remove when https://github.com/ppy/osu-framework/pull/5092 is available.
+        private T? findClosestParent<T>() where T : class, IDrawable
+        {
+            Drawable cursor = this;
+
+            while ((cursor = cursor.Parent) != null)
+            {
+                if (cursor is T match)
+                    return match;
+            }
+
+            return default;
+        }
+    }
+}

From 901032bfa21e0916efa9ce1b5b184f1978f53e8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 18:25:27 +0900
Subject: [PATCH 19/25] Animate multiplier display

---
 .../Mods/DifficultyMultiplierDisplay.cs       |  5 ++--
 osu.Game/Overlays/Mods/ModSelectScreen.cs     | 27 +++++++++++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 4fc3a904fa..4d3f630a55 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Overlays.Mods
 {
     public class DifficultyMultiplierDisplay : CompositeDrawable, IHasCurrentValue<double>
     {
+        public const float HEIGHT = 42;
+
         public Bindable<double> Current
         {
             get => current.Current;
@@ -42,13 +44,12 @@ namespace osu.Game.Overlays.Mods
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        private const float height = 42;
         private const float multiplier_value_area_width = 56;
         private const float transition_duration = 200;
 
         public DifficultyMultiplierDisplay()
         {
-            Height = height;
+            Height = HEIGHT;
             AutoSizeAxes = Axes.X;
 
             InternalChild = new Container
diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index 8468448bbb..3437922cc8 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -84,13 +84,21 @@ namespace osu.Game.Overlays.Mods
                                 {
                                     new Container
                                     {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Padding = new MarginPadding { Horizontal = 100, Vertical = 10 },
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        AutoSizeAxes = Axes.X,
+                                        RelativePositionAxes = Axes.X,
+                                        X = 0.3f,
+                                        Height = DifficultyMultiplierDisplay.HEIGHT,
+                                        Margin = new MarginPadding
+                                        {
+                                            Horizontal = 100,
+                                            Vertical = 10
+                                        },
                                         Child = multiplierDisplay = new DifficultyMultiplierDisplay
                                         {
-                                            Anchor = Anchor.CentreRight,
-                                            Origin = Anchor.CentreRight
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre
                                         }
                                     }
                                 },
@@ -283,6 +291,11 @@ namespace osu.Game.Overlays.Mods
             footer.MoveToY(0, fade_in_duration, Easing.OutQuint);
 
             this.FadeIn(fade_in_duration, Easing.OutQuint);
+
+            multiplierDisplay
+                .Delay(300)
+                .FadeIn(200, Easing.OutQuint)
+                .ScaleTo(1, fade_in_duration, Easing.OutElastic);
         }
 
         protected override void PopOut()
@@ -291,6 +304,10 @@ namespace osu.Game.Overlays.Mods
 
             base.PopOut();
 
+            multiplierDisplay
+                .FadeOut(200, Easing.OutQuint)
+                .ScaleTo(0.75f, fade_out_duration, Easing.OutQuint);
+
             header.MoveToY(-header.DrawHeight, fade_out_duration, Easing.OutQuint);
             footer.MoveToY(footer.DrawHeight, fade_out_duration, Easing.OutQuint);
 

From 9fdeb2053746f6e0b35366cbedb4026034640ef9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 18:27:34 +0900
Subject: [PATCH 20/25] Animate individual `ModColumn`s during togle of oerlay

---
 osu.Game/Overlays/Mods/ModColumn.cs       | 143 ++++++++++++----------
 osu.Game/Overlays/Mods/ModSelectScreen.cs |  15 +++
 2 files changed, 91 insertions(+), 67 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 8531ae1e3f..f84ae4ac8a 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Overlays.Mods
 {
     public class ModColumn : CompositeDrawable
     {
+        public readonly Container TopLevelContent;
+
         public readonly ModType ModType;
 
         private Func<Mod, bool>? filter;
@@ -78,90 +80,97 @@ namespace osu.Game.Overlays.Mods
             Width = 320;
             RelativeSizeAxes = Axes.Y;
             Shear = new Vector2(ModPanel.SHEAR_X, 0);
-            CornerRadius = ModPanel.CORNER_RADIUS;
-            Masking = true;
 
             Container controlContainer;
             InternalChildren = new Drawable[]
             {
-                new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = header_height + ModPanel.CORNER_RADIUS,
-                    Children = new Drawable[]
-                    {
-                        headerBackground = new Box
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = header_height + ModPanel.CORNER_RADIUS
-                        },
-                        headerText = new OsuTextFlowContainer(t =>
-                        {
-                            t.Font = OsuFont.TorusAlternate.With(size: 17);
-                            t.Shadow = false;
-                            t.Colour = Colour4.Black;
-                        })
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Shear = new Vector2(-ModPanel.SHEAR_X, 0),
-                            Padding = new MarginPadding
-                            {
-                                Horizontal = 17,
-                                Bottom = ModPanel.CORNER_RADIUS
-                            }
-                        }
-                    }
-                },
-                new Container
+                TopLevelContent = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Top = header_height },
-                    Child = contentContainer = new Container
+                    CornerRadius = ModPanel.CORNER_RADIUS,
+                    Masking = true,
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        CornerRadius = ModPanel.CORNER_RADIUS,
-                        BorderThickness = 3,
-                        Children = new Drawable[]
+                        new Container
                         {
-                            contentBackground = new Box
+                            RelativeSizeAxes = Axes.X,
+                            Height = header_height + ModPanel.CORNER_RADIUS,
+                            Children = new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both
-                            },
-                            new GridContainer
+                                headerBackground = new Box
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    Height = header_height + ModPanel.CORNER_RADIUS
+                                },
+                                headerText = new OsuTextFlowContainer(t =>
+                                {
+                                    t.Font = OsuFont.TorusAlternate.With(size: 17);
+                                    t.Shadow = false;
+                                    t.Colour = Colour4.Black;
+                                })
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    Shear = new Vector2(-ModPanel.SHEAR_X, 0),
+                                    Padding = new MarginPadding
+                                    {
+                                        Horizontal = 17,
+                                        Bottom = ModPanel.CORNER_RADIUS
+                                    }
+                                }
+                            }
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Top = header_height },
+                            Child = contentContainer = new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RowDimensions = new[]
+                                Masking = true,
+                                CornerRadius = ModPanel.CORNER_RADIUS,
+                                BorderThickness = 3,
+                                Children = new Drawable[]
                                 {
-                                    new Dimension(GridSizeMode.AutoSize),
-                                    new Dimension()
-                                },
-                                Content = new[]
-                                {
-                                    new Drawable[]
+                                    contentBackground = new Box
                                     {
-                                        controlContainer = new Container
-                                        {
-                                            RelativeSizeAxes = Axes.X,
-                                            Padding = new MarginPadding { Horizontal = 14 }
-                                        }
+                                        RelativeSizeAxes = Axes.Both
                                     },
-                                    new Drawable[]
+                                    new GridContainer
                                     {
-                                        new NestedVerticalScrollContainer
+                                        RelativeSizeAxes = Axes.Both,
+                                        RowDimensions = new[]
                                         {
-                                            RelativeSizeAxes = Axes.Both,
-                                            ClampExtension = 100,
-                                            ScrollbarOverlapsContent = false,
-                                            Child = panelFlow = new FillFlowContainer<ModPanel>
+                                            new Dimension(GridSizeMode.AutoSize),
+                                            new Dimension()
+                                        },
+                                        Content = new[]
+                                        {
+                                            new Drawable[]
                                             {
-                                                RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y,
-                                                Spacing = new Vector2(0, 7),
-                                                Padding = new MarginPadding(7)
+                                                controlContainer = new Container
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    Padding = new MarginPadding { Horizontal = 14 }
+                                                }
+                                            },
+                                            new Drawable[]
+                                            {
+                                                new NestedVerticalScrollContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    ClampExtension = 100,
+                                                    ScrollbarOverlapsContent = false,
+                                                    Child = panelFlow = new FillFlowContainer<ModPanel>
+                                                    {
+                                                        RelativeSizeAxes = Axes.X,
+                                                        AutoSizeAxes = Axes.Y,
+                                                        Spacing = new Vector2(0, 7),
+                                                        Padding = new MarginPadding(7)
+                                                    }
+                                                }
                                             }
                                         }
                                     }
diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index 3437922cc8..1009c2edf6 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -106,6 +106,7 @@ namespace osu.Game.Overlays.Mods
                                 {
                                     new Container
                                     {
+                                        Depth = float.MaxValue,
                                         RelativeSizeAxes = Axes.Both,
                                         RelativePositionAxes = Axes.Both,
                                         Children = new Drawable[]
@@ -296,6 +297,13 @@ namespace osu.Game.Overlays.Mods
                 .Delay(300)
                 .FadeIn(200, Easing.OutQuint)
                 .ScaleTo(1, fade_in_duration, Easing.OutElastic);
+
+            for (int i = 0; i < columnFlow.Count; i++)
+            {
+                columnFlow[i].TopLevelContent
+                             .Delay(i * 30)
+                             .MoveToY(0, fade_in_duration, Easing.OutQuint);
+            }
         }
 
         protected override void PopOut()
@@ -312,6 +320,13 @@ namespace osu.Game.Overlays.Mods
             footer.MoveToY(footer.DrawHeight, fade_out_duration, Easing.OutQuint);
 
             this.FadeOut(fade_out_duration, Easing.OutQuint);
+
+            for (int i = 0; i < columnFlow.Count; i++)
+            {
+                const float distance = 700;
+
+                columnFlow[i].TopLevelContent.MoveToY(i % 2 == 0 ? -distance : distance, fade_out_duration, Easing.OutQuint);
+            }
         }
 
         private class ModColumnContainer : FillFlowContainer<ModColumn>

From 7a1820e6bb99a48101033da2abf8a9a6cd4670fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 18:25:27 +0900
Subject: [PATCH 21/25] Fix multiplier display resetting transformations

---
 osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 4d3f630a55..248d4f288e 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -146,8 +146,9 @@ namespace osu.Game.Overlays.Mods
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
             current.BindValueChanged(_ => updateState(), true);
-            FinishTransforms(true);
+
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
             multiplierCounter.SetCountWithoutRolling(Current.Value);

From 54715885af16463759bb1aa99ed70f298232bb6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 18:38:31 +0900
Subject: [PATCH 22/25] Adjust animation metrics slightly

---
 osu.Game/Overlays/Mods/ModSelectScreen.cs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index 1009c2edf6..c43987ea60 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -284,25 +284,25 @@ namespace osu.Game.Overlays.Mods
 
         protected override void PopIn()
         {
-            const double fade_in_duration = 500;
+            const double fade_in_duration = 400;
 
             base.PopIn();
+            this.FadeIn(fade_in_duration, Easing.OutQuint);
 
             header.MoveToY(0, fade_in_duration, Easing.OutQuint);
             footer.MoveToY(0, fade_in_duration, Easing.OutQuint);
 
-            this.FadeIn(fade_in_duration, Easing.OutQuint);
-
             multiplierDisplay
-                .Delay(300)
-                .FadeIn(200, Easing.OutQuint)
+                .Delay(fade_in_duration * 0.65f)
+                .FadeIn(fade_in_duration / 2, Easing.OutQuint)
                 .ScaleTo(1, fade_in_duration, Easing.OutElastic);
 
             for (int i = 0; i < columnFlow.Count; i++)
             {
                 columnFlow[i].TopLevelContent
                              .Delay(i * 30)
-                             .MoveToY(0, fade_in_duration, Easing.OutQuint);
+                             .MoveToY(0, fade_in_duration, Easing.OutQuint)
+                             .FadeIn(fade_in_duration, Easing.OutQuint);
             }
         }
 
@@ -311,21 +311,22 @@ namespace osu.Game.Overlays.Mods
             const double fade_out_duration = 500;
 
             base.PopOut();
+            this.FadeOut(fade_out_duration, Easing.OutQuint);
 
             multiplierDisplay
-                .FadeOut(200, Easing.OutQuint)
+                .FadeOut(fade_out_duration / 2, Easing.OutQuint)
                 .ScaleTo(0.75f, fade_out_duration, Easing.OutQuint);
 
             header.MoveToY(-header.DrawHeight, fade_out_duration, Easing.OutQuint);
             footer.MoveToY(footer.DrawHeight, fade_out_duration, Easing.OutQuint);
 
-            this.FadeOut(fade_out_duration, Easing.OutQuint);
-
             for (int i = 0; i < columnFlow.Count; i++)
             {
                 const float distance = 700;
 
-                columnFlow[i].TopLevelContent.MoveToY(i % 2 == 0 ? -distance : distance, fade_out_duration, Easing.OutQuint);
+                columnFlow[i].TopLevelContent
+                             .MoveToY(i % 2 == 0 ? -distance : distance, fade_out_duration, Easing.OutQuint)
+                             .FadeOut(fade_out_duration, Easing.OutQuint);
             }
         }
 

From 631aa2a6ec8e35be514953c4c4b40e35a51cdb4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 18:44:25 +0900
Subject: [PATCH 23/25] Remove left padding to allow left-most column to exist
 further to the.. left

---
 osu.Game/Overlays/Mods/ModSelectScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectScreen.cs b/osu.Game/Overlays/Mods/ModSelectScreen.cs
index c43987ea60..62080ec1b5 100644
--- a/osu.Game/Overlays/Mods/ModSelectScreen.cs
+++ b/osu.Game/Overlays/Mods/ModSelectScreen.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Overlays.Mods
                                                     RelativeSizeAxes = Axes.Y,
                                                     AutoSizeAxes = Axes.X,
                                                     Spacing = new Vector2(10, 0),
-                                                    Margin = new MarginPadding { Horizontal = 70 },
+                                                    Margin = new MarginPadding { Right = 70 },
                                                     Children = new[]
                                                     {
                                                         new ModColumn(ModType.DifficultyReduction, false, new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P }),

From 32daf64a31a09cc459461957d0aa709c52f015f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 19:23:35 +0900
Subject: [PATCH 24/25] Use newly exposed framework helper function to find
 closest parent

---
 osu.Android.props                                |  2 +-
 .../Mods/NestedVerticalScrollContainer.cs        | 16 +---------------
 osu.Game/osu.Game.csproj                         |  2 +-
 osu.iOS.props                                    |  4 ++--
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 6a3b113fa2..a168d351fc 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.325.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.325.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.405.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs b/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
index c62b52ef27..1bf965beeb 100644
--- a/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
+++ b/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            parentScrollContainer = findClosestParent<OsuScrollContainer>();
+            parentScrollContainer = this.FindClosestParent<OsuScrollContainer>();
         }
 
         protected override bool OnScroll(ScrollEvent e)
@@ -43,19 +43,5 @@ namespace osu.Game.Overlays.Mods
 
             return base.OnScroll(e);
         }
-
-        // TODO: remove when https://github.com/ppy/osu-framework/pull/5092 is available.
-        private T? findClosestParent<T>() where T : class, IDrawable
-        {
-            Drawable cursor = this;
-
-            while ((cursor = cursor.Parent) != null)
-            {
-                if (cursor is T match)
-                    return match;
-            }
-
-            return default;
-        }
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3c01f29671..e968c6602d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.10.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.325.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.405.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.325.0" />
     <PackageReference Include="Sentry" Version="3.14.1" />
     <PackageReference Include="SharpCompress" Version="0.30.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c8f170497d..e441ed81ab 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.325.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.405.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.325.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -84,7 +84,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.325.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.405.0" />
     <PackageReference Include="SharpCompress" Version="0.30.1" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From ac799aaf7a412db957203074b9110776ad61dfbf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Apr 2022 19:25:47 +0900
Subject: [PATCH 25/25] Add missing newline

---
 osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs b/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
index 1bf965beeb..aba47d5423 100644
--- a/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
+++ b/osu.Game/Overlays/Mods/NestedVerticalScrollContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 #nullable enable
+
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;