h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 20:53:04 +08:00
Code Issues Releases Wiki Activity

Fix quick-deleting unselected slider path control point also deleting all selected control points

Browse Source 
Closes https://github.com/ppy/osu/issues/31308.

Logic matches corresponding quick-delete logic in
130802e480/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs (L307-L316).
This commit is contained in:
Bartłomiej Dach 2024-12-30 09:42:48 +01:00
parent aa67f87fe9
commit 182f998f9b
No known key found for this signature in database
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
View File

@ -137,11 +137,27 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
/// <summary> /// <summary>
/// Delete all visually selected <see cref="PathControlPoint"/>s. /// Delete all visually selected <see cref="PathControlPoint"/>s.
/// </summary> /// </summary>
/// <returns></returns> /// <returns>Whether any change actually took place.</returns>
public bool DeleteSelected() public bool DeleteSelected()
{ {
List<PathControlPoint> toRemove = Pieces.Where(p => p.IsSelected.Value).Select(p => p.ControlPoint).ToList(); List<PathControlPoint> toRemove = Pieces.Where(p => p.IsSelected.Value).Select(p => p.ControlPoint).ToList();
if (!Delete(toRemove))
return false;
// Since pieces are re-used, they will not point to the deleted control points while remaining selected
foreach (var piece in Pieces)
piece.IsSelected.Value = false;
return true;
}
/// <summary>
/// Delete the specified <see cref="PathControlPoint"/>s.
/// </summary>
/// <returns>Whether any change actually took place.</returns>
public bool Delete(List<PathControlPoint> toRemove)
{
// Ensure that there are any points to be deleted // Ensure that there are any points to be deleted
if (toRemove.Count == 0) if (toRemove.Count == 0)
return false; return false;
@ -149,11 +165,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
changeHandler?.BeginChange(); changeHandler?.BeginChange();
RemoveControlPointsRequested?.Invoke(toRemove); RemoveControlPointsRequested?.Invoke(toRemove);
changeHandler?.EndChange(); changeHandler?.EndChange();
// Since pieces are re-used, they will not point to the deleted control points while remaining selected
foreach (var piece in Pieces)
piece.IsSelected.Value = false;
return true; return true;
} }

7
osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
View File

@ -140,8 +140,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
if (hoveredControlPoint == null) if (hoveredControlPoint == null)
return false; return false;
hoveredControlPoint.IsSelected.Value = true; if (hoveredControlPoint.IsSelected.Value)
ControlPointVisualiser?.DeleteSelected(); ControlPointVisualiser?.DeleteSelected();
else
ControlPointVisualiser?.Delete([hoveredControlPoint.ControlPoint]);
return true; return true;
} }