From d69dc457ba2adf3d0a6db8f89237292cebb62efd Mon Sep 17 00:00:00 2001
From: Adam Baker <joshbothhoth@gmail.com>
Date: Thu, 21 Jul 2022 17:28:43 -0500
Subject: [PATCH] Extract zoom delta method

---
 .../Edit/Compose/Components/Timeline/TimelineArea.cs        | 4 +---
 .../Compose/Components/Timeline/ZoomableScrollContainer.cs  | 6 ++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index c25a4834d3..b47c09109b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private readonly Drawable userContent;
 
-        private const float zoom_button_sensitivity = 0.02f;
-
         public TimelineArea(Drawable content = null)
         {
             RelativeSizeAxes = Axes.X;
@@ -156,6 +154,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Timeline.TicksVisible.BindTo(ticksCheckbox.Current);
         }
 
-        private void changeZoom(float change) => Timeline.Zoom += change * Timeline.MaxZoom * zoom_button_sensitivity;
+        private void changeZoom(float change) => Timeline.Zoom += Timeline.CalculateZoomChange(change);
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 7a4d45301f..9bd7332105 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             set => updateZoom(value);
         }
 
-        private const float zoom_scroll_sensitivity = 0.02f;
+        private const float zoom_change_sensitivity = 0.02f;
 
         private void updateZoom(float? value = null)
         {
@@ -129,7 +129,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (e.AltPressed)
             {
                 // zoom when holding alt.
-                setZoomTarget(zoomTarget + e.ScrollDelta.Y * MaxZoom * zoom_scroll_sensitivity, zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);
+                setZoomTarget(zoomTarget + CalculateZoomChange(e.ScrollDelta.Y), zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);
                 return true;
             }
 
@@ -167,6 +167,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
         }
 
+        public float CalculateZoomChange(float rawChange) => rawChange * MaxZoom * zoom_change_sensitivity;
+
         private class TransformZoom : Transform<float, ZoomableScrollContainer>
         {
             /// <summary>