1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 08:52:55 +08:00

Merge pull request #21018 from andy840119/reuse-the-function-in-timeline-class

Reuse function in the timeline class
This commit is contained in:
Dean Herbert 2022-10-30 23:49:02 +09:00 committed by GitHub
commit 9ea2bd84bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -250,7 +250,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private void seekTrackToCurrent() private void seekTrackToCurrent()
{ {
double target = Current / Content.DrawWidth * editorClock.TrackLength; double target = TimeAtPosition(Current);
editorClock.Seek(Math.Min(editorClock.TrackLength, target)); editorClock.Seek(Math.Min(editorClock.TrackLength, target));
} }
@ -264,7 +264,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (handlingDragInput) if (handlingDragInput)
editorClock.Stop(); editorClock.Stop();
ScrollTo((float)(editorClock.CurrentTime / editorClock.TrackLength) * Content.DrawWidth, false); float position = PositionAtTime(editorClock.CurrentTime);
ScrollTo(position, false);
} }
protected override bool OnMouseDown(MouseDownEvent e) protected override bool OnMouseDown(MouseDownEvent e)