RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-19 04:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18252 from peppy/editor-track-shortcuts

Browse Source 
Add editor track traversal shortcut keys (`Z`-`V`)
This commit is contained in:
Bartłomiej Dach 2022-05-13 20:42:22 +02:00 committed by GitHub
commit b533ed5e9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
View File

@ -28,6 +28,51 @@ namespace osu.Game.Tests.Visual.Editing
return beatmap;
}
[Test]
public void TestSeekToFirst()
{
pressAndCheckTime(Key.Z, 2170);
pressAndCheckTime(Key.Z, 0);
pressAndCheckTime(Key.Z, 2170);
AddAssert("track not running", () => !EditorClock.IsRunning);
}
[Test]
public void TestRestart()
{
pressAndCheckTime(Key.V, 227170);
AddAssert("track not running", () => !EditorClock.IsRunning);
AddStep("press X", () => InputManager.Key(Key.X));
AddAssert("track running", () => EditorClock.IsRunning);
AddAssert("time restarted", () => EditorClock.CurrentTime < 100000);
}
[Test]
public void TestPauseResume()
{
AddAssert("track not running", () => !EditorClock.IsRunning);
AddStep("press C", () => InputManager.Key(Key.C));
AddAssert("track running", () => EditorClock.IsRunning);
AddStep("press C", () => InputManager.Key(Key.C));
AddAssert("track not running", () => !EditorClock.IsRunning);
}
[Test]
public void TestSeekToLast()
{
pressAndCheckTime(Key.V, 227170);
pressAndCheckTime(Key.V, 229170);
pressAndCheckTime(Key.V, 227170);
AddAssert("track not running", () => !EditorClock.IsRunning);
}
[Test]
public void TestSnappedSeeking()
{

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

@ -33,6 +33,7 @@ using osu.Game.Overlays.Notifications;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit.Components;
using osu.Game.Screens.Edit.Components.Menus;
using osu.Game.Screens.Edit.Components.Timelines.Summary;
@ -475,6 +476,44 @@ namespace osu.Game.Screens.Edit
case Key.Right:
seek(e, 1);
return true;
// Track traversal keys.
// Matching osu-stable implementations.
case Key.Z:
// Seek to first object time, or track start if already there.
double? firstObjectTime = editorBeatmap.HitObjects.FirstOrDefault()?.StartTime;
if (firstObjectTime == null || clock.CurrentTime == firstObjectTime)
clock.Seek(0);
else
clock.Seek(firstObjectTime.Value);
return true;
case Key.X:
// Restart playback from beginning of track.
clock.Seek(0);
clock.Start();
return true;
case Key.C:
// Pause or resume.
if (clock.IsRunning)
clock.Stop();
else
clock.Start();
return true;
case Key.V:
// Seek to last object time, or track end if already there.
// Note that in osu-stable subsequent presses when at track end won't return to last object.
// This has intentionally been changed to make it more useful.
double? lastObjectTime = editorBeatmap.HitObjects.LastOrDefault()?.GetEndTime();
if (lastObjectTime == null || clock.CurrentTime == lastObjectTime)
clock.Seek(clock.TrackLength);
else
clock.Seek(lastObjectTime.Value);
return true;
}
return base.OnKeyDown(e);