sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 23:53:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'editor-fix-multiple-selection' into editor-clipboard

Browse Source
This commit is contained in:
Dean Herbert
2020-09-14 15:47:20 +09:00
parent 66faae2a6b b7a06524fb
commit 62c55165d4
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
View File

@ -145,16 +145,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// <param name="blueprint">The blueprint.</param> /// <param name="blueprint">The blueprint.</param>
internal void HandleSelected(SelectionBlueprint blueprint) internal void HandleSelected(SelectionBlueprint blueprint)
{ {
if (!selectedBlueprints.Contains(blueprint)) selectedBlueprints.Add(blueprint);
{
selectedBlueprints.Add(blueprint);
// need to check this as well, as there are potentially multiple SelectionHandlers and the above check is not enough. // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.HitObject)) if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.HitObject))
EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject); EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
UpdateVisibility(); UpdateVisibility();
}
} }
/// <summary> /// <summary>
@ -163,12 +160,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// <param name="blueprint">The blueprint.</param> /// <param name="blueprint">The blueprint.</param>
internal void HandleDeselected(SelectionBlueprint blueprint) internal void HandleDeselected(SelectionBlueprint blueprint)
{ {
if (selectedBlueprints.Remove(blueprint)) selectedBlueprints.Remove(blueprint);
{
EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
UpdateVisibility(); EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
}
UpdateVisibility();
} }
/// <summary> /// <summary>