h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-17 06:32:36 +08:00
Code Issues Releases Wiki Activity

Extract zoom delta method

Browse Source
This commit is contained in:
Adam Baker
2022-07-21 17:28:43 -05:00
Unverified
parent a4f071fe53
commit d69dc457ba
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+1 -3
View File
@@ -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);
}
}
osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+4 -2
View File
@@ -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>