1
0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 22:14:57 +08:00

Merge branch 'master' into fix-spinner-test-not-playing-samples

This commit is contained in:
Bartłomiej Dach
2021-01-15 19:52:54 +01:00
committed by GitHub
Unverified
@@ -138,6 +138,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
scrollToTrackTime();
}
protected override bool OnScroll(ScrollEvent e)
{
// if this is not a precision scroll event, let the editor handle the seek itself (for snapping support)
if (!e.AltPressed && !e.IsPrecise)
return false;
return base.OnScroll(e);
}
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();