From 118f862342dd5903cfdea4661c15302ca6b361f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 12:02:10 +0900
Subject: [PATCH 1/2] Fix not being able to seek using scroll wheel in timeline
 while playing track

---
 .../Components/Timeline/ZoomableScrollContainer.cs   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 7ce8a751e0..baaad63e57 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input.Events;
+using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -30,6 +32,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private float currentZoom = 1;
 
+        [Resolved]
+        private IFrameBasedClock editorClock { get; set; }
+
         public ZoomableScrollContainer()
             : base(Direction.Horizontal)
         {
@@ -104,8 +109,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         protected override bool OnScroll(ScrollEvent e)
         {
             if (e.IsPrecise)
+            {
+                // can't handle scroll correctly while playing.
+                // the editor will handle this case for us.
+                if (editorClock.IsRunning)
+                    return false;
+
                 // for now, we don't support zoom when using a precision scroll device. this needs gesture support.
                 return base.OnScroll(e);
+            }
 
             setZoomTarget(zoomTarget + e.ScrollDelta.Y, zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);
             return true;

From 0e439e3a7025a2cfded813fda28f90c8d9a79a88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 14:41:55 +0900
Subject: [PATCH 2/2] Fix missing dependency in ZoomableScrollContainer test

---
 .../Compose/Components/Timeline/ZoomableScrollContainer.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index baaad63e57..227eecf9c7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private float currentZoom = 1;
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private IFrameBasedClock editorClock { get; set; }
 
         public ZoomableScrollContainer()
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 // can't handle scroll correctly while playing.
                 // the editor will handle this case for us.
-                if (editorClock.IsRunning)
+                if (editorClock?.IsRunning == true)
                     return false;
 
                 // for now, we don't support zoom when using a precision scroll device. this needs gesture support.