From 32416e4e313eb818464355124415d661e23b8b2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 17:42:10 +0900
Subject: [PATCH] Move model selection handling to base `SelectionHandler`
 class

---
 .../Compose/Components/EditorSelectionHandler.cs | 16 ----------------
 .../Edit/Compose/Components/SelectionHandler.cs  |  5 +++++
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index a117d42574..4c6833cc4a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -37,22 +37,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
         }
 
-        internal override void HandleSelected(SelectionBlueprint<HitObject> blueprint)
-        {
-            base.HandleSelected(blueprint);
-
-            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
-            if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.Item))
-                EditorBeatmap.SelectedHitObjects.Add(blueprint.Item);
-        }
-
-        internal override void HandleDeselected(SelectionBlueprint<HitObject> blueprint)
-        {
-            base.HandleDeselected(blueprint);
-
-            EditorBeatmap.SelectedHitObjects.Remove(blueprint.Item);
-        }
-
         protected override void DeleteItems(IEnumerable<HitObject> items) => EditorBeatmap.RemoveRange(items);
 
         #region Selection State
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 1ee1de7d43..59ade746a9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -196,6 +196,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal virtual void HandleSelected(SelectionBlueprint<T> blueprint)
         {
+            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
+            if (!SelectedItems.Contains(blueprint.Item))
+                SelectedItems.Add(blueprint.Item);
+
             selectedBlueprints.Add(blueprint);
         }
 
@@ -205,6 +209,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal virtual void HandleDeselected(SelectionBlueprint<T> blueprint)
         {
+            SelectedItems.Remove(blueprint.Item);
             selectedBlueprints.Remove(blueprint);
         }