Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always perform non-seeked scroll in the editor while audio is playing #2828

Merged
merged 2 commits into from Jun 21, 2018
Merged

Always perform non-seeked scroll in the editor while audio is playing #2828

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c671f9
Always perform non-seeked scroll in the editor while audio is playing
smoogipoo Jun 18, 2018
e17d60d
Merge branch 'master' into improve-editor-scrolling
peppy Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions osu.Game/Screens/Edit/Editor.cs
View file
Open in desktop
Expand Up @@ -181,9 +181,9 @@ private void onModeChanged(EditorScreenMode mode)
protected override bool OnScroll(InputState state)
{
if (state.Mouse.ScrollDelta.X + state.Mouse.ScrollDelta.Y > 0)
clock.SeekBackward(true);
clock.SeekBackward(!clock.IsRunning);
else
clock.SeekForward(true);
clock.SeekForward(!clock.IsRunning);
return true;
}

Expand Down