sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-editor-scroll-interruption

Browse Source
This commit is contained in:
Dan Balasescu
2021-01-21 17:46:18 +09:00
committed by GitHub
parent 9eb74e86ed 11a9a4c773
commit 04095cd5b9
105 changed files with 1349 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();