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

Merge pull request #3759 from peppy/fix-editor-precise-scroll

Browse Source 
Fix precision scroll events being handled incorrectly by editor
This commit is contained in:
Dan Balasescu 2018-11-23 10:34:42 +09:00 committed by GitHub
commit 91b484a643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Overlays/Volume/VolumeMeter.cs
View File

@ -228,15 +228,19 @@ namespace osu.Game.Overlays.Volume
public void Decrease(double amount = 1, bool isPrecise = false) => adjust(-amount, isPrecise); public void Decrease(double amount = 1, bool isPrecise = false) => adjust(-amount, isPrecise);
// because volume precision is set to 0.01, this local is required to keep track of more precise adjustments and only apply when possible. // because volume precision is set to 0.01, this local is required to keep track of more precise adjustments and only apply when possible.
private double adjustAccumulator; private double scrollAccumulation;
private void adjust(double delta, bool isPrecise) private void adjust(double delta, bool isPrecise)
{ {
adjustAccumulator += delta * adjust_step * (isPrecise ? 0.1 : 1); scrollAccumulation += delta * adjust_step * (isPrecise ? 0.1 : 1);
if (Math.Abs(adjustAccumulator) < Bindable.Precision)
return; var precision = Bindable.Precision;
Volume += adjustAccumulator;
adjustAccumulator = 0; while (Math.Abs(scrollAccumulation) > precision)
{
Volume += Math.Sign(scrollAccumulation) * precision;
scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);
}
} }
protected override bool OnScroll(ScrollEvent e) protected override bool OnScroll(ScrollEvent e)

15
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,24 @@ 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);
const int precision = 1;
while (Math.Abs(scrollAccumulation) > precision)
{
if (scrollAccumulation > 0)
clock.SeekBackward(!clock.IsRunning); clock.SeekBackward(!clock.IsRunning);
else else
clock.SeekForward(!clock.IsRunning); clock.SeekForward(!clock.IsRunning);
scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);
}
return true; return true;
} }