From 85ada3275b23d49bd5dea344c07072a204cb7e07 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Dec 2024 14:14:30 +0900
Subject: [PATCH 01/12] Skip the pause cooldown when in intro / break time

Had a quick look at adding test coverage in `TestScenePause` but the
setup to get into either of these states seems a bit annoying..
---
 osu.Game/Screens/Play/Player.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a762d2ae82..406a59a3b6 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1032,7 +1032,7 @@ namespace osu.Game.Screens.Play
         private double? lastPauseActionTime;
 
         protected bool PauseCooldownActive =>
-            lastPauseActionTime.HasValue && GameplayClockContainer.CurrentTime < lastPauseActionTime + PauseCooldownDuration;
+            PlayingState.Value == LocalUserPlayingState.Playing && lastPauseActionTime.HasValue && GameplayClockContainer.CurrentTime < lastPauseActionTime + PauseCooldownDuration;
 
         /// <summary>
         /// A set of conditionals which defines whether the current game state and configuration allows for

From bdd417c1a1cd832b0433863d3ce151af60f99093 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Dec 2024 15:18:39 +0900
Subject: [PATCH 02/12] Move "global" scroll-adjusts-volume to a per-screen
 component-based implementation

---
 .../TestSceneOverlayContainer.cs              | 19 +++++--
 .../UserInterface/TestSceneVolumeOverlay.cs   | 18 +++---
 osu.Game/OsuGame.cs                           | 20 ++++---
 .../Volume/GlobalScrollAdjustsVolume.cs       | 40 +++++++++++++
 .../Overlays/Volume/VolumeControlReceptor.cs  | 57 -------------------
 osu.Game/Screens/Menu/MainMenu.cs             |  2 +
 osu.Game/Screens/Play/Player.cs               |  7 ++-
 osu.Game/Screens/Play/PlayerLoader.cs         |  2 +
 osu.Game/Screens/Select/SongSelect.cs         |  3 +
 9 files changed, 92 insertions(+), 76 deletions(-)
 create mode 100644 osu.Game/Overlays/Volume/GlobalScrollAdjustsVolume.cs
 delete mode 100644 osu.Game/Overlays/Volume/VolumeControlReceptor.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
index bb94912c83..e544fb127d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays.Volume;
@@ -59,13 +60,12 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestAltScrollNotBlocked()
         {
-            bool scrollReceived = false;
+            TestGlobalScrollAdjustsVolume volumeAdjust = null!;
 
-            AddStep("add volume control receptor", () => Add(new VolumeControlReceptor
+            AddStep("add volume control receptor", () => Add(volumeAdjust = new TestGlobalScrollAdjustsVolume
             {
                 RelativeSizeAxes = Axes.Both,
                 Depth = float.MaxValue,
-                ScrollActionRequested = (_, _, _) => scrollReceived = true,
             }));
 
             AddStep("hold alt", () => InputManager.PressKey(Key.AltLeft));
@@ -75,10 +75,21 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.ScrollVerticalBy(10);
             });
 
-            AddAssert("receptor received scroll input", () => scrollReceived);
+            AddAssert("receptor received scroll input", () => volumeAdjust.ScrollReceived);
             AddStep("release alt", () => InputManager.ReleaseKey(Key.AltLeft));
         }
 
+        public partial class TestGlobalScrollAdjustsVolume : GlobalScrollAdjustsVolume
+        {
+            public bool ScrollReceived { get; private set; }
+
+            protected override bool OnScroll(ScrollEvent e)
+            {
+                ScrollReceived = true;
+                return base.OnScroll(e);
+            }
+        }
+
         private partial class TestOverlay : OsuFocusedOverlayContainer
         {
             [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneVolumeOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneVolumeOverlay.cs
index 52543c68ce..c2b8ec76f4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneVolumeOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneVolumeOverlay.cs
@@ -1,8 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Volume;
@@ -11,7 +10,14 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public partial class TestSceneVolumeOverlay : OsuTestScene
     {
-        private VolumeOverlay volume;
+        private VolumeOverlay volume = null!;
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.CacheAs(volume = new VolumeOverlay());
+            return dependencies;
+        }
 
         protected override void LoadComplete()
         {
@@ -19,12 +25,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddRange(new Drawable[]
             {
-                volume = new VolumeOverlay(),
-                new VolumeControlReceptor
+                volume,
+                new GlobalScrollAdjustsVolume
                 {
                     RelativeSizeAxes = Axes.Both,
-                    ActionRequested = action => volume.Adjust(action),
-                    ScrollActionRequested = (action, amount, isPrecise) => volume.Adjust(action, amount, isPrecise),
                 },
             });
 
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e808e570c7..60fcd17ac6 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -57,7 +57,6 @@ using osu.Game.Overlays.Notifications;
 using osu.Game.Overlays.OSD;
 using osu.Game.Overlays.SkinEditor;
 using osu.Game.Overlays.Toolbar;
-using osu.Game.Overlays.Volume;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;
@@ -980,12 +979,6 @@ namespace osu.Game
 
             AddRange(new Drawable[]
             {
-                new VolumeControlReceptor
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ActionRequested = action => volume.Adjust(action),
-                    ScrollActionRequested = (action, amount, isPrecise) => volume.Adjust(action, amount, isPrecise),
-                },
                 ScreenOffsetContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -1432,6 +1425,19 @@ namespace osu.Game
 
             switch (e.Action)
             {
+                case GlobalAction.DecreaseVolume:
+                case GlobalAction.IncreaseVolume:
+                    return volume.Adjust(e.Action);
+
+                case GlobalAction.ToggleMute:
+                case GlobalAction.NextVolumeMeter:
+                case GlobalAction.PreviousVolumeMeter:
+
+                    if (!e.Repeat)
+                        return true;
+
+                    return volume.Adjust(e.Action);
+
                 case GlobalAction.ToggleFPSDisplay:
                     fpsCounter.ToggleVisibility();
                     return true;
diff --git a/osu.Game/Overlays/Volume/GlobalScrollAdjustsVolume.cs b/osu.Game/Overlays/Volume/GlobalScrollAdjustsVolume.cs
new file mode 100644
index 0000000000..81be084d22
--- /dev/null
+++ b/osu.Game/Overlays/Volume/GlobalScrollAdjustsVolume.cs
@@ -0,0 +1,40 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osu.Game.Input.Bindings;
+
+namespace osu.Game.Overlays.Volume
+{
+    /// <summary>
+    /// Add to a container or screen to make scrolling anywhere in the container cause the global game volume to be adjusted.
+    /// </summary>
+    /// <remarks>
+    /// This is generally expected behaviour in many locations in osu!stable.
+    /// </remarks>
+    public partial class GlobalScrollAdjustsVolume : Container
+    {
+        [Resolved]
+        private VolumeOverlay? volumeOverlay { get; set; }
+
+        public GlobalScrollAdjustsVolume()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected override bool OnScroll(ScrollEvent e)
+        {
+            if (e.ScrollDelta.Y == 0)
+                return false;
+
+            // forward any unhandled mouse scroll events to the volume control.
+            return volumeOverlay?.Adjust(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise) ?? false;
+        }
+
+        public bool OnScroll(KeyBindingScrollEvent<GlobalAction> e) =>
+            volumeOverlay?.Adjust(e.Action, e.ScrollAmount, e.IsPrecise) ?? false;
+    }
+}
diff --git a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
deleted file mode 100644
index 2e8d86d4c7..0000000000
--- a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// 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 disable
-
-using System;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Input;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-using osu.Game.Input.Bindings;
-
-namespace osu.Game.Overlays.Volume
-{
-    public partial class VolumeControlReceptor : Container, IScrollBindingHandler<GlobalAction>, IHandleGlobalKeyboardInput
-    {
-        public Func<GlobalAction, bool> ActionRequested;
-        public Func<GlobalAction, float, bool, bool> ScrollActionRequested;
-
-        public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
-        {
-            switch (e.Action)
-            {
-                case GlobalAction.DecreaseVolume:
-                case GlobalAction.IncreaseVolume:
-                    return ActionRequested?.Invoke(e.Action) == true;
-
-                case GlobalAction.ToggleMute:
-                case GlobalAction.NextVolumeMeter:
-                case GlobalAction.PreviousVolumeMeter:
-                    if (!e.Repeat)
-                        return ActionRequested?.Invoke(e.Action) == true;
-
-                    return false;
-            }
-
-            return false;
-        }
-
-        public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
-        {
-        }
-
-        protected override bool OnScroll(ScrollEvent e)
-        {
-            if (e.ScrollDelta.Y == 0)
-                return false;
-
-            // forward any unhandled mouse scroll events to the volume control.
-            ScrollActionRequested?.Invoke(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise);
-            return true;
-        }
-
-        public bool OnScroll(KeyBindingScrollEvent<GlobalAction> e) =>
-            ScrollActionRequested?.Invoke(e.Action, e.ScrollAmount, e.IsPrecise) ?? false;
-    }
-}
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 0630b9612e..ae1ad4dceb 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -28,6 +28,7 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.SkinEditor;
+using osu.Game.Overlays.Volume;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
@@ -124,6 +125,7 @@ namespace osu.Game.Screens.Menu
 
             AddRangeInternal(new[]
             {
+                new GlobalScrollAdjustsVolume(),
                 buttonsContainer = new ParallaxContainer
                 {
                     ParallaxAmount = 0.01f,
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a762d2ae82..1c186485b8 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -28,6 +28,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Volume;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -251,7 +252,11 @@ namespace osu.Game.Screens.Play
 
             dependencies.CacheAs(HealthProcessor);
 
-            InternalChild = GameplayClockContainer = CreateGameplayClockContainer(Beatmap.Value, DrawableRuleset.GameplayStartTime);
+            InternalChildren = new Drawable[]
+            {
+                new GlobalScrollAdjustsVolume(),
+                GameplayClockContainer = CreateGameplayClockContainer(Beatmap.Value, DrawableRuleset.GameplayStartTime),
+            };
 
             AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer));
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 20985c20e0..837974a8f2 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -27,6 +27,7 @@ using osu.Game.Input;
 using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Overlays.Volume;
 using osu.Game.Performance;
 using osu.Game.Scoring;
 using osu.Game.Screens.Menu;
@@ -190,6 +191,7 @@ namespace osu.Game.Screens.Play
 
             InternalChildren = new Drawable[]
             {
+                new GlobalScrollAdjustsVolume(),
                 (content = new LogoTrackingContainer
                 {
                     Anchor = Anchor.Centre,
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 9f7a2c02ff..210f8203f4 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -31,6 +31,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
+using osu.Game.Overlays.Volume;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Backgrounds;
@@ -169,10 +170,12 @@ namespace osu.Game.Screens.Select
 
             AddRangeInternal(new Drawable[]
             {
+                new GlobalScrollAdjustsVolume(),
                 new VerticalMaskingContainer
                 {
                     Children = new Drawable[]
                     {
+                        new GlobalScrollAdjustsVolume(),
                         new GridContainer // used for max width implementation
                         {
                             RelativeSizeAxes = Axes.Both,

From 68a5618e81013b40eafadd7cf4bb3b8962fc9a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 16 Dec 2024 16:03:26 +0900
Subject: [PATCH 03/12] Add test coverage

---
 .../Visual/Gameplay/TestScenePause.cs         | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 6aa2c4e40d..7855c138ab 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
@@ -19,6 +20,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
+using osu.Game.Storyboards;
 using osuTK;
 using osuTK.Input;
 
@@ -28,6 +30,12 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         protected new PausePlayer Player => (PausePlayer)base.Player;
 
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+        {
+            beatmap.AudioLeadIn = 4000;
+            return base.CreateWorkingBeatmap(beatmap, storyboard);
+        }
+
         private readonly Container content;
 
         protected override Container<Drawable> Content => content;
@@ -202,6 +210,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestUserPauseDuringCooldownTooSoon()
         {
+            AddStep("seek to gameplay", () => Player.GameplayClockContainer.Seek(0));
             AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
 
             pauseAndConfirm();
@@ -213,9 +222,23 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmNotExited();
         }
 
+        [Test]
+        public void TestUserPauseDuringIntroSkipsCooldown()
+        {
+            AddStep("seek before gameplay", () => Player.GameplayClockContainer.Seek(-5000));
+            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
+
+            pauseAndConfirm();
+
+            resume();
+            pauseViaBackAction();
+            confirmPaused();
+        }
+
         [Test]
         public void TestQuickExitDuringCooldownTooSoon()
         {
+            AddStep("seek to gameplay", () => Player.GameplayClockContainer.Seek(0));
             AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
 
             pauseAndConfirm();

From c46e81d8908c2e73f6d194f1b233a8b6fd81f6aa Mon Sep 17 00:00:00 2001
From: Salman Alshamrani <frenzibyte@gmail.com>
Date: Wed, 11 Dec 2024 03:31:51 -0500
Subject: [PATCH 04/12] Roll our own iOS application delegates

---
 osu.Game.Rulesets.Catch.Tests.iOS/AppDelegate.cs  | 15 +++++++++++++++
 .../{Application.cs => Program.cs}                |  7 +++----
 osu.Game.Rulesets.Mania.Tests.iOS/AppDelegate.cs  | 15 +++++++++++++++
 .../{Application.cs => Program.cs}                |  7 +++----
 osu.Game.Rulesets.Osu.Tests.iOS/AppDelegate.cs    | 15 +++++++++++++++
 .../{Application.cs => Program.cs}                |  7 +++----
 osu.Game.Rulesets.Taiko.Tests.iOS/AppDelegate.cs  | 15 +++++++++++++++
 .../{Application.cs => Program.cs}                |  7 +++----
 osu.Game.Tests.iOS/AppDelegate.cs                 | 14 ++++++++++++++
 osu.Game.Tests.iOS/{Application.cs => Program.cs} |  6 +++---
 osu.iOS/AppDelegate.cs                            | 14 ++++++++++++++
 osu.iOS/{Application.cs => Program.cs}            |  6 +++---
 12 files changed, 106 insertions(+), 22 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests.iOS/AppDelegate.cs
 rename osu.Game.Rulesets.Catch.Tests.iOS/{Application.cs => Program.cs} (66%)
 create mode 100644 osu.Game.Rulesets.Mania.Tests.iOS/AppDelegate.cs
 rename osu.Game.Rulesets.Mania.Tests.iOS/{Application.cs => Program.cs} (66%)
 create mode 100644 osu.Game.Rulesets.Osu.Tests.iOS/AppDelegate.cs
 rename osu.Game.Rulesets.Osu.Tests.iOS/{Application.cs => Program.cs} (66%)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests.iOS/AppDelegate.cs
 rename osu.Game.Rulesets.Taiko.Tests.iOS/{Application.cs => Program.cs} (66%)
 create mode 100644 osu.Game.Tests.iOS/AppDelegate.cs
 rename osu.Game.Tests.iOS/{Application.cs => Program.cs} (69%)
 create mode 100644 osu.iOS/AppDelegate.cs
 rename osu.iOS/{Application.cs => Program.cs} (69%)

diff --git a/osu.Game.Rulesets.Catch.Tests.iOS/AppDelegate.cs b/osu.Game.Rulesets.Catch.Tests.iOS/AppDelegate.cs
new file mode 100644
index 0000000000..b594d28611
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests.iOS/AppDelegate.cs
@@ -0,0 +1,15 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Catch.Tests.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameApplicationDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuTestBrowser();
+    }
+}
diff --git a/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs b/osu.Game.Rulesets.Catch.Tests.iOS/Program.cs
similarity index 66%
rename from osu.Game.Rulesets.Catch.Tests.iOS/Application.cs
rename to osu.Game.Rulesets.Catch.Tests.iOS/Program.cs
index d097c6a698..6b887ae2d4 100644
--- a/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs
+++ b/osu.Game.Rulesets.Catch.Tests.iOS/Program.cs
@@ -1,16 +1,15 @@
 // 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 osu.Framework.iOS;
-using osu.Game.Tests;
+using UIKit;
 
 namespace osu.Game.Rulesets.Catch.Tests.iOS
 {
-    public static class Application
+    public static class Program
     {
         public static void Main(string[] args)
         {
-            GameApplication.Main(new OsuTestBrowser());
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests.iOS/AppDelegate.cs b/osu.Game.Rulesets.Mania.Tests.iOS/AppDelegate.cs
new file mode 100644
index 0000000000..09bed3b42b
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests.iOS/AppDelegate.cs
@@ -0,0 +1,15 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Mania.Tests.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameApplicationDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuTestBrowser();
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests.iOS/Application.cs b/osu.Game.Rulesets.Mania.Tests.iOS/Program.cs
similarity index 66%
rename from osu.Game.Rulesets.Mania.Tests.iOS/Application.cs
rename to osu.Game.Rulesets.Mania.Tests.iOS/Program.cs
index 75a5a73058..696816c47b 100644
--- a/osu.Game.Rulesets.Mania.Tests.iOS/Application.cs
+++ b/osu.Game.Rulesets.Mania.Tests.iOS/Program.cs
@@ -1,16 +1,15 @@
 // 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 osu.Framework.iOS;
-using osu.Game.Tests;
+using UIKit;
 
 namespace osu.Game.Rulesets.Mania.Tests.iOS
 {
-    public static class Application
+    public static class Program
     {
         public static void Main(string[] args)
         {
-            GameApplication.Main(new OsuTestBrowser());
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests.iOS/AppDelegate.cs b/osu.Game.Rulesets.Osu.Tests.iOS/AppDelegate.cs
new file mode 100644
index 0000000000..77177e93f1
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests.iOS/AppDelegate.cs
@@ -0,0 +1,15 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Osu.Tests.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameApplicationDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuTestBrowser();
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests.iOS/Application.cs b/osu.Game.Rulesets.Osu.Tests.iOS/Program.cs
similarity index 66%
rename from osu.Game.Rulesets.Osu.Tests.iOS/Application.cs
rename to osu.Game.Rulesets.Osu.Tests.iOS/Program.cs
index f9059014a5..579e20e05a 100644
--- a/osu.Game.Rulesets.Osu.Tests.iOS/Application.cs
+++ b/osu.Game.Rulesets.Osu.Tests.iOS/Program.cs
@@ -1,16 +1,15 @@
 // 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 osu.Framework.iOS;
-using osu.Game.Tests;
+using UIKit;
 
 namespace osu.Game.Rulesets.Osu.Tests.iOS
 {
-    public static class Application
+    public static class Program
     {
         public static void Main(string[] args)
         {
-            GameApplication.Main(new OsuTestBrowser());
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests.iOS/AppDelegate.cs b/osu.Game.Rulesets.Taiko.Tests.iOS/AppDelegate.cs
new file mode 100644
index 0000000000..4bfc12e7e8
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests.iOS/AppDelegate.cs
@@ -0,0 +1,15 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Taiko.Tests.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameApplicationDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuTestBrowser();
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests.iOS/Application.cs b/osu.Game.Rulesets.Taiko.Tests.iOS/Program.cs
similarity index 66%
rename from osu.Game.Rulesets.Taiko.Tests.iOS/Application.cs
rename to osu.Game.Rulesets.Taiko.Tests.iOS/Program.cs
index 0b6a11d8c2..bf2ffecb23 100644
--- a/osu.Game.Rulesets.Taiko.Tests.iOS/Application.cs
+++ b/osu.Game.Rulesets.Taiko.Tests.iOS/Program.cs
@@ -1,16 +1,15 @@
 // 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 osu.Framework.iOS;
-using osu.Game.Tests;
+using UIKit;
 
 namespace osu.Game.Rulesets.Taiko.Tests.iOS
 {
-    public static class Application
+    public static class Program
     {
         public static void Main(string[] args)
         {
-            GameApplication.Main(new OsuTestBrowser());
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }
diff --git a/osu.Game.Tests.iOS/AppDelegate.cs b/osu.Game.Tests.iOS/AppDelegate.cs
new file mode 100644
index 0000000000..bfad59de43
--- /dev/null
+++ b/osu.Game.Tests.iOS/AppDelegate.cs
@@ -0,0 +1,14 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+
+namespace osu.Game.Tests.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameApplicationDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuTestBrowser();
+    }
+}
diff --git a/osu.Game.Tests.iOS/Application.cs b/osu.Game.Tests.iOS/Program.cs
similarity index 69%
rename from osu.Game.Tests.iOS/Application.cs
rename to osu.Game.Tests.iOS/Program.cs
index e5df79f3de..35a90d7213 100644
--- a/osu.Game.Tests.iOS/Application.cs
+++ b/osu.Game.Tests.iOS/Program.cs
@@ -1,15 +1,15 @@
 // 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 osu.Framework.iOS;
+using UIKit;
 
 namespace osu.Game.Tests.iOS
 {
-    public static class Application
+    public static class Program
     {
         public static void Main(string[] args)
         {
-            GameApplication.Main(new OsuTestBrowser());
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }
diff --git a/osu.iOS/AppDelegate.cs b/osu.iOS/AppDelegate.cs
new file mode 100644
index 0000000000..e88b39f710
--- /dev/null
+++ b/osu.iOS/AppDelegate.cs
@@ -0,0 +1,14 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+
+namespace osu.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameApplicationDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuGameIOS();
+    }
+}
diff --git a/osu.iOS/Application.cs b/osu.iOS/Program.cs
similarity index 69%
rename from osu.iOS/Application.cs
rename to osu.iOS/Program.cs
index 74bd58acb8..fd24ecf419 100644
--- a/osu.iOS/Application.cs
+++ b/osu.iOS/Program.cs
@@ -1,15 +1,15 @@
 // 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 osu.Framework.iOS;
+using UIKit;
 
 namespace osu.iOS
 {
-    public static class Application
+    public static class Program
     {
         public static void Main(string[] args)
         {
-            GameApplication.Main(new OsuGameIOS());
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }

From 532c681e3c53c0b3f36f18201afca884ebcdf144 Mon Sep 17 00:00:00 2001
From: Salman Alshamrani <frenzibyte@gmail.com>
Date: Wed, 18 Dec 2024 12:48:24 -0500
Subject: [PATCH 05/12] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 632325725a..6770b0254f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.1206.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.1219.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 847c209cc4..7317adf959 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2024.1206.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2024.1219.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2024.1202.0" />
     <PackageReference Include="Sentry" Version="4.13.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index 62a65f291d..640e6bdd94 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -17,6 +17,6 @@
     <MtouchInterpreter>-all</MtouchInterpreter>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2024.1206.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2024.1219.0" />
   </ItemGroup>
 </Project>

From df607ac3ea33cd531272e35df0fb1023cf21dcfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Dec 2024 00:38:46 +0900
Subject: [PATCH 06/12] Load seasonal backgrounds without requiring being
 logged in

---
 osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index 6f6febb646..b4be330f9c 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Graphics.Backgrounds
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
         private Bindable<SeasonalBackgroundMode> seasonalBackgroundMode;
         private Bindable<APISeasonalBackgrounds> seasonalBackgrounds;
 
@@ -47,13 +46,12 @@ namespace osu.Game.Graphics.Backgrounds
                     SeasonalBackgroundChanged?.Invoke();
             });
 
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(fetchSeasonalBackgrounds, true);
+            fetchSeasonalBackgrounds();
         }
 
-        private void fetchSeasonalBackgrounds(ValueChangedEvent<APIState> stateChanged)
+        private void fetchSeasonalBackgrounds()
         {
-            if (seasonalBackgrounds.Value != null || stateChanged.NewValue != APIState.Online)
+            if (seasonalBackgrounds.Value != null)
                 return;
 
             var request = new GetSeasonalBackgroundsRequest();

From f9939e7f9562ed24ad83db4cf18cf19c30eba113 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Dec 2024 00:50:53 +0900
Subject: [PATCH 07/12] Remove invalid test

---
 .../TestSceneSeasonalBackgroundLoader.cs       | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
index 54a722cee0..7b22ff1d6a 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
@@ -131,21 +131,6 @@ namespace osu.Game.Tests.Visual.Background
             assertNoBackgrounds();
         }
 
-        [Test]
-        public void TestDelayedConnectivity()
-        {
-            registerBackgroundsResponse(DateTimeOffset.Now.AddDays(30));
-            setSeasonalBackgroundMode(SeasonalBackgroundMode.Always);
-            AddStep("go offline", () => dummyAPI.SetState(APIState.Offline));
-
-            createLoader();
-            assertNoBackgrounds();
-
-            AddStep("go online", () => dummyAPI.SetState(APIState.Online));
-
-            assertAnyBackground();
-        }
-
         private void registerBackgroundsResponse(DateTimeOffset endDate)
             => AddStep("setup request handler", () =>
             {
@@ -185,7 +170,8 @@ namespace osu.Game.Tests.Visual.Background
             {
                 previousBackground = (SeasonalBackground)backgroundContainer.SingleOrDefault();
                 background = backgroundLoader.LoadNextBackground();
-                LoadComponentAsync(background, bg => backgroundContainer.Child = bg);
+                if (background != null)
+                    LoadComponentAsync(background, bg => backgroundContainer.Child = bg);
             });
 
             AddUntilStep("background loaded", () => background.IsLoaded);

From a94ada2ec6563bf2ca8d84444506d477677a11a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Dec 2024 14:19:03 +0900
Subject: [PATCH 08/12] Update resources

---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f011b7c3d1..fe3bdbffa3 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2024.1220.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2024.1219.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2024.1219.1" />
     <PackageReference Include="Sentry" Version="4.13.0" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
     <PackageReference Include="SharpCompress" Version="0.38.0" />

From 5d1701469848f89410d84a220e065754f003a42b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Dec 2024 16:31:06 +0900
Subject: [PATCH 09/12] Fix mouse wheel disable not working during gameplay

---
 .../TestSceneMouseWheelVolumeAdjust.cs        | 14 +++---
 .../Volume/GlobalScrollAdjustsVolume.cs       |  3 --
 .../Play/GameplayScrollWheelHandling.cs       | 44 +++++++++++++++++++
 osu.Game/Screens/Play/Player.cs               | 18 +-------
 4 files changed, 53 insertions(+), 26 deletions(-)
 create mode 100644 osu.Game/Screens/Play/GameplayScrollWheelHandling.cs

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneMouseWheelVolumeAdjust.cs b/osu.Game.Tests/Visual/Navigation/TestSceneMouseWheelVolumeAdjust.cs
index a89f5fb647..26a37fa211 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneMouseWheelVolumeAdjust.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneMouseWheelVolumeAdjust.cs
@@ -1,8 +1,6 @@
 // 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 disable
-
 using NUnit.Framework;
 using osu.Framework.Extensions;
 using osu.Game.Configuration;
@@ -58,7 +56,11 @@ namespace osu.Game.Tests.Visual.Navigation
 
             // First scroll makes volume controls appear, second adjusts volume.
             AddRepeatStep("Adjust volume using mouse wheel", () => InputManager.ScrollVerticalBy(5), 10);
-            AddAssert("Volume is still zero", () => Game.Audio.Volume.Value == 0);
+            AddAssert("Volume is still zero", () => Game.Audio.Volume.Value, () => Is.Zero);
+
+            AddStep("Pause", () => InputManager.PressKey(Key.Escape));
+            AddRepeatStep("Adjust volume using mouse wheel", () => InputManager.ScrollVerticalBy(5), 10);
+            AddAssert("Volume is above zero", () => Game.Audio.Volume.Value > 0);
         }
 
         [Test]
@@ -80,8 +82,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
         private void loadToPlayerNonBreakTime()
         {
-            Player player = null;
-            Screens.Select.SongSelect songSelect = null;
+            Player? player = null;
+            Screens.Select.SongSelect songSelect = null!;
             PushAndConfirm(() => songSelect = new TestSceneScreenNavigation.TestPlaySongSelect());
             AddUntilStep("wait for song select", () => songSelect.BeatmapSetsLoaded);
 
@@ -95,7 +97,7 @@ namespace osu.Game.Tests.Visual.Navigation
                 return (player = Game.ScreenStack.CurrentScreen as Player) != null;
             });
 
-            AddUntilStep("wait for play time active", () => !player.IsBreakTime.Value);
+            AddUntilStep("wait for play time active", () => player!.IsBreakTime.Value, () => Is.False);
         }
     }
 }
diff --git a/osu.Game/Overlays/Volume/GlobalScrollAdjustsVolume.cs b/osu.Game/Overlays/Volume/GlobalScrollAdjustsVolume.cs
index 81be084d22..f1ad88833b 100644
--- a/osu.Game/Overlays/Volume/GlobalScrollAdjustsVolume.cs
+++ b/osu.Game/Overlays/Volume/GlobalScrollAdjustsVolume.cs
@@ -33,8 +33,5 @@ namespace osu.Game.Overlays.Volume
             // forward any unhandled mouse scroll events to the volume control.
             return volumeOverlay?.Adjust(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise) ?? false;
         }
-
-        public bool OnScroll(KeyBindingScrollEvent<GlobalAction> e) =>
-            volumeOverlay?.Adjust(e.Action, e.ScrollAmount, e.IsPrecise) ?? false;
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayScrollWheelHandling.cs b/osu.Game/Screens/Play/GameplayScrollWheelHandling.cs
new file mode 100644
index 0000000000..73ad9ccb24
--- /dev/null
+++ b/osu.Game/Screens/Play/GameplayScrollWheelHandling.cs
@@ -0,0 +1,44 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Input.Events;
+using osu.Game.Configuration;
+using osu.Game.Overlays.Volume;
+
+namespace osu.Game.Screens.Play
+{
+    /// <summary>
+    /// Primarily handles volume adjustment in gameplay.
+    ///
+    /// - If the user has mouse wheel disabled, only allow during break time or when holding alt. Also block scroll from parent handling.
+    /// - Otherwise always allow, as per <see cref="GlobalScrollAdjustsVolume"/> implementation.
+    /// </summary>
+    internal class GameplayScrollWheelHandling : GlobalScrollAdjustsVolume
+    {
+        private Bindable<bool> mouseWheelDisabled = null!;
+
+        [Resolved]
+        private IGameplayClock gameplayClock { get; set; } = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
+        }
+
+        protected override bool OnScroll(ScrollEvent e)
+        {
+            // During pause, allow global volume adjust regardless of settings.
+            if (gameplayClock.IsPaused.Value)
+                return base.OnScroll(e);
+
+            // Block any parent handling of scroll if the user has asked for it (special case when holding "Alt").
+            if (mouseWheelDisabled.Value && !e.AltPressed)
+                return true;
+
+            return base.OnScroll(e);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1c186485b8..f6b0230714 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -15,7 +15,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
@@ -28,7 +27,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Volume;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -89,8 +87,6 @@ namespace osu.Game.Screens.Play
         private bool isRestarting;
         private bool skipExitTransition;
 
-        private Bindable<bool> mouseWheelDisabled;
-
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
         public IBindable<bool> LocalUserPlaying => localUserPlaying;
@@ -229,8 +225,6 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
-
             if (game != null)
                 gameActive.BindTo(game.IsActive);
 
@@ -254,7 +248,6 @@ namespace osu.Game.Screens.Play
 
             InternalChildren = new Drawable[]
             {
-                new GlobalScrollAdjustsVolume(),
                 GameplayClockContainer = CreateGameplayClockContainer(Beatmap.Value, DrawableRuleset.GameplayStartTime),
             };
 
@@ -271,6 +264,7 @@ namespace osu.Game.Screens.Play
             dependencies.CacheAs(GameplayState = new GameplayState(playableBeatmap, ruleset, gameplayMods, Score, ScoreProcessor, HealthProcessor, Beatmap.Value.Storyboard));
 
             var rulesetSkinProvider = new RulesetSkinProvidingContainer(ruleset, playableBeatmap, Beatmap.Value.Skin);
+            GameplayClockContainer.Add(new GameplayScrollWheelHandling());
 
             // load the skinning hierarchy first.
             // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
@@ -899,16 +893,6 @@ namespace osu.Game.Screens.Play
             });
         }
 
-        protected override bool OnScroll(ScrollEvent e)
-        {
-            // During pause, allow global volume adjust regardless of settings.
-            if (GameplayClockContainer.IsPaused.Value)
-                return false;
-
-            // Block global volume adjust if the user has asked for it (special case when holding "Alt").
-            return mouseWheelDisabled.Value && !e.AltPressed;
-        }
-
         #region Gameplay leaderboard
 
         protected readonly Bindable<bool> LeaderboardExpandedState = new BindableBool();

From 48ce68694a4d01cf57171332453d66b1393962cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Dec 2024 17:06:47 +0900
Subject: [PATCH 10/12] Add missing partial

---
 osu.Game/Screens/Play/GameplayScrollWheelHandling.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/GameplayScrollWheelHandling.cs b/osu.Game/Screens/Play/GameplayScrollWheelHandling.cs
index 73ad9ccb24..059d5a0dd4 100644
--- a/osu.Game/Screens/Play/GameplayScrollWheelHandling.cs
+++ b/osu.Game/Screens/Play/GameplayScrollWheelHandling.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Play
     /// - If the user has mouse wheel disabled, only allow during break time or when holding alt. Also block scroll from parent handling.
     /// - Otherwise always allow, as per <see cref="GlobalScrollAdjustsVolume"/> implementation.
     /// </summary>
-    internal class GameplayScrollWheelHandling : GlobalScrollAdjustsVolume
+    internal partial class GameplayScrollWheelHandling : GlobalScrollAdjustsVolume
     {
         private Bindable<bool> mouseWheelDisabled = null!;
 

From 25373c3f9c9b2f4b4b5d6c7d7da1bc2685885320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 20 Dec 2024 09:50:58 +0100
Subject: [PATCH 11/12] Fix backwards repeat check

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 60fcd17ac6..244b72edaa 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1433,7 +1433,7 @@ namespace osu.Game
                 case GlobalAction.NextVolumeMeter:
                 case GlobalAction.PreviousVolumeMeter:
 
-                    if (!e.Repeat)
+                    if (e.Repeat)
                         return true;
 
                     return volume.Adjust(e.Action);

From 3ec63d00cbd32b5ab31dd3b5705f9e0dedb229bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 19 Dec 2024 13:26:52 +0100
Subject: [PATCH 12/12] Silence test that apparently can't work on CI

---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 7855c138ab..58fe6e8e56 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -208,6 +208,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
+        [Ignore("Fails on github runners if they happen to skip too far forward in time.")]
         public void TestUserPauseDuringCooldownTooSoon()
         {
             AddStep("seek to gameplay", () => Player.GameplayClockContainer.Seek(0));