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

Select closest timing point every time the timing screen is changed to

Browse Source 
No issue thread for this, was pointed out internally:
https://discord.com/channels/90072389919997952/1259818301517725707/1316604605777444905

Due to the custom setup that editor has with its nested
"screens-that-aren't-screens", the logic that selects the closest
timing point to the current time would only fire on the first open of
the screen. Seems like a good idea to have it fire every time instead.
This commit is contained in:
Bartłomiej Dach 2025-01-08 14:19:50 +01:00
parent e7070bd812
commit 5a2024777d
No known key found for this signature in database
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
osu.Game/Screens/Edit/Timing/TimingScreen.cs
View File

@ -15,6 +15,8 @@ namespace osu.Game.Screens.Edit.Timing
[Cached] [Cached]
public readonly Bindable<ControlPointGroup> SelectedGroup = new Bindable<ControlPointGroup>(); public readonly Bindable<ControlPointGroup> SelectedGroup = new Bindable<ControlPointGroup>();
private readonly Bindable<EditorScreenMode> currentEditorMode = new Bindable<EditorScreenMode>();
[Resolved] [Resolved]
private EditorClock? editorClock { get; set; } private EditorClock? editorClock { get; set; }
@ -41,18 +43,35 @@ namespace osu.Game.Screens.Edit.Timing
} }
}; };
[BackgroundDependencyLoader]
private void load(Editor? editor)
{
if (editor != null)
currentEditorMode.BindTo(editor.Mode);
}
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
if (editorClock != null) // When entering the timing screen, let's choose the closest valid timing point.
// This will emulate the osu-stable behaviour where a metronome and timing information
// are presented on entering the screen.
currentEditorMode.BindValueChanged(mode =>
{ {
// When entering the timing screen, let's choose the closest valid timing point. if (mode.NewValue == EditorScreenMode.Timing)
// This will emulate the osu-stable behaviour where a metronome and timing information selectClosestTimingPoint();
// are presented on entering the screen. });
var nearestTimingPoint = EditorBeatmap.ControlPointInfo.TimingPointAt(editorClock.CurrentTime); selectClosestTimingPoint();
SelectedGroup.Value = EditorBeatmap.ControlPointInfo.GroupAt(nearestTimingPoint.Time); }
}
private void selectClosestTimingPoint()
{
if (editorClock == null)
return;
var nearestTimingPoint = EditorBeatmap.ControlPointInfo.TimingPointAt(editorClock.CurrentTime);
SelectedGroup.Value = EditorBeatmap.ControlPointInfo.GroupAt(nearestTimingPoint.Time);
} }
protected override void ConfigureTimeline(TimelineArea timelineArea) protected override void ConfigureTimeline(TimelineArea timelineArea)