sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-25 23:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Extract zoom delta method

Browse Source
This commit is contained in:
Adam Baker 2022-07-21 17:28:43 -05:00
parent a4f071fe53
commit d69dc457ba
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
View File

@ -20,8 +20,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private readonly Drawable userContent; private readonly Drawable userContent;
private const float zoom_button_sensitivity = 0.02f;
public TimelineArea(Drawable content = null) public TimelineArea(Drawable content = null)
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
@ -156,6 +154,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
Timeline.TicksVisible.BindTo(ticksCheckbox.Current); 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);
} }
} }

6
osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
View File

@ -104,7 +104,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
set => updateZoom(value); 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) private void updateZoom(float? value = null)
{ {
@ -129,7 +129,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (e.AltPressed) if (e.AltPressed)
{ {
// zoom when holding alt. // 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; 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> private class TransformZoom : Transform<float, ZoomableScrollContainer>
{ {
/// <summary> /// <summary>