h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-11 10:57:20 +08:00
Code Issues Releases Wiki Activity

Merge pull request #31791 from bdach/unify-selection-behaviour

Browse Source 
Always select the closest control point group regardless of whether it has a timing point on entering timing screen
This commit is contained in:
Dean Herbert 2025-02-04 22:32:22 +09:00 committed by GitHub
commit 87ff8778c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/Edit/Timing/ControlPointList.cs
View File

@ -20,6 +20,8 @@ namespace osu.Game.Screens.Edit.Timing
{
public partial class ControlPointList : CompositeDrawable
{
public Action? SelectClosestTimingPoint { get; init; }
private ControlPointTable table = null!;
private Container controls = null!;
private OsuButton deleteButton = null!;
@ -75,7 +77,7 @@ namespace osu.Game.Screens.Edit.Timing
new RoundedButton
{
Text = "Select closest to current time",
Action = goToCurrentGroup,
Action = SelectClosestTimingPoint,
Size = new Vector2(220, 30),
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
@ -146,17 +148,6 @@ namespace osu.Game.Screens.Edit.Timing
table.Padding = new MarginPadding { Bottom = controls.DrawHeight };
}
private void goToCurrentGroup()
{
double accurateTime = clock.CurrentTimeAccurate;
var activeTimingPoint = Beatmap.ControlPointInfo.TimingPointAt(accurateTime);
var activeEffectPoint = Beatmap.ControlPointInfo.EffectPointAt(accurateTime);
double latestActiveTime = Math.Max(activeTimingPoint.Time, activeEffectPoint.Time);
selectedGroup.Value = Beatmap.ControlPointInfo.GroupAt(latestActiveTime);
}
private void delete()
{
if (selectedGroup.Value == null)

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

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@ -37,7 +38,10 @@ namespace osu.Game.Screens.Edit.Timing
{
new Drawable[]
{
new ControlPointList(),
new ControlPointList
{
SelectClosestTimingPoint = selectClosestTimingPoint,
},
new ControlPointSettings(),
},
}
@ -70,8 +74,18 @@ namespace osu.Game.Screens.Edit.Timing
if (editorClock == null)
return;
var nearestTimingPoint = EditorBeatmap.ControlPointInfo.TimingPointAt(editorClock.CurrentTime);
SelectedGroup.Value = EditorBeatmap.ControlPointInfo.GroupAt(nearestTimingPoint.Time);
double accurateTime = editorClock.CurrentTimeAccurate;
var activeTimingPoint = EditorBeatmap.ControlPointInfo.TimingPointAt(accurateTime);
var activeEffectPoint = EditorBeatmap.ControlPointInfo.EffectPointAt(accurateTime);
if (activeEffectPoint.Equals(EffectControlPoint.DEFAULT))
SelectedGroup.Value = EditorBeatmap.ControlPointInfo.GroupAt(activeTimingPoint.Time);
else
{
double latestActiveTime = Math.Max(activeTimingPoint.Time, activeEffectPoint.Time);
SelectedGroup.Value = EditorBeatmap.ControlPointInfo.GroupAt(latestActiveTime);
}
}
protected override void ConfigureTimeline(TimelineArea timelineArea)