h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 08:02:55 +08:00
Code Issues Releases Wiki Activity

Fix precision scroll events being handled incorrectly by editor

Browse Source
This commit is contained in:
Dean Herbert 2018-11-22 19:40:44 +09:00
parent 72dba5d7ac
commit a48c26d999
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Screens/Edit/Editor.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osuTK.Graphics; using osuTK.Graphics;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Screens.Backgrounds; using osu.Game.Screens.Backgrounds;
@ -181,12 +182,20 @@ namespace osu.Game.Screens.Edit
LoadComponentAsync(currentScreen, screenContainer.Add); LoadComponentAsync(currentScreen, screenContainer.Add);
} }
private double scrollAccumulation;
protected override bool OnScroll(ScrollEvent e) protected override bool OnScroll(ScrollEvent e)
{ {
if (e.ScrollDelta.X + e.ScrollDelta.Y > 0) scrollAccumulation += e.ScrollDelta.X + e.ScrollDelta.Y * (e.IsPrecise ? 0.1 : 1);
if (Math.Abs(scrollAccumulation) < 1)
return true;
if (scrollAccumulation > 0)
clock.SeekBackward(!clock.IsRunning); clock.SeekBackward(!clock.IsRunning);
else else
clock.SeekForward(!clock.IsRunning); clock.SeekForward(!clock.IsRunning);
scrollAccumulation = 0;
return true; return true;
} }