sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 06:07:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i-beat-snapping' into timeline-maybe

Browse Source
This commit is contained in:
Dean Herbert
2020-01-23 15:37:54 +09:00
parent 56c044c44a ccf911884b
commit 289be7a17b
99 changed files with 467 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
View File

@ -50,7 +50,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
DragBox.Alpha = 0;
}
protected override bool OnDrag(DragEvent e)
protected override void OnDrag(DragEvent e)
{
if (timeline != null)
{
@ -64,14 +64,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
timeline.ScrollBy((float)((mouseX - timelineQuad.TopLeft.X) / 10 * Clock.ElapsedFrameTime));
}
base.OnDrag(e);
lastDragEvent = e;
return base.OnDrag(e);
}
protected override bool OnDragEnd(DragEndEvent e)
protected override void OnDragEnd(DragEndEvent e)
{
base.OnDragEnd(e);
lastDragEvent = null;
return base.OnDragEnd(e);
}
protected override void Update()