From a4f071fe53e2d1d3e105ffdf0d20c4f65eec5db0 Mon Sep 17 00:00:00 2001
From: Adam Baker <joshbothhoth@gmail.com>
Date: Thu, 21 Jul 2022 08:26:48 -0500
Subject: [PATCH] Make zoom sensitivity relative to containers max zoom

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index 97dc04b9fa..c25a4834d3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -20,6 +20,8 @@ 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;
@@ -154,6 +156,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Timeline.TicksVisible.BindTo(ticksCheckbox.Current);
         }
 
-        private void changeZoom(float change) => Timeline.Zoom += change;
+        private void changeZoom(float change) => Timeline.Zoom += change * Timeline.MaxZoom * zoom_button_sensitivity;
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 80cdef38e9..7a4d45301f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -104,6 +104,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             set => updateZoom(value);
         }
 
+        private const float zoom_scroll_sensitivity = 0.02f;
+
         private void updateZoom(float? value = null)
         {
             float newZoom = Math.Clamp(value ?? Zoom, MinZoom, MaxZoom);
@@ -127,7 +129,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (e.AltPressed)
             {
                 // zoom when holding alt.
-                setZoomTarget(zoomTarget + e.ScrollDelta.Y, zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);
+                setZoomTarget(zoomTarget + e.ScrollDelta.Y * MaxZoom * zoom_scroll_sensitivity, zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);
                 return true;
             }