From 202fe093065ef46560555d78402fbf3c49f8a762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 28 Oct 2020 22:03:59 +0100
Subject: [PATCH] Group selection actions back up in SelectionHandler

---
 .../Sliders/SliderSelectionBlueprint.cs         |  4 ++--
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs    | 17 -----------------
 .../Compose/Components/BlueprintContainer.cs    |  7 -------
 .../Edit/Compose/Components/SelectionHandler.cs |  5 ++++-
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index ca9ec886d5..d3fb5defae 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -107,14 +107,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             {
                 case MouseButton.Right:
                     rightClickPosition = e.MouseDownPosition;
-                    break;
+                    return false; // Allow right click to be handled by context menu
 
                 case MouseButton.Left when e.ControlPressed && IsSelected:
                     placementControlPointIndex = addControlPoint(e.MousePosition);
                     return true; // Stop input from being handled and modifying the selection
             }
 
-            return base.OnMouseDown(e);
+            return false;
         }
 
         private int? placementControlPointIndex;
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 87ef7e647f..f3816f6218 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -8,13 +8,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Screens.Edit;
 using osuTK;
-using osuTK.Input;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -55,20 +52,6 @@ namespace osu.Game.Rulesets.Edit
             updateState();
         }
 
-        [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            if (e.CurrentState.Keyboard.ShiftPressed && e.IsPressed(MouseButton.Right))
-            {
-                editorBeatmap.Remove(HitObject);
-                return true;
-            }
-
-            return base.OnMouseDown(e);
-        }
-
         private SelectionState state;
 
         public event Action<SelectionState> StateChanged;
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7751df29cf..5ac360d029 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -298,13 +298,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             Debug.Assert(!clickSelectionBegan);
 
-            // Deselections are only allowed for control + left clicks
-            bool allowDeselection = e.ControlPressed && e.Button == MouseButton.Left;
-
-            // Todo: This is probably incorrectly disallowing multiple selections on stacked objects
-            if (!allowDeselection && SelectionHandler.SelectedBlueprints.Any(s => s.IsHovered))
-                return;
-
             foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
             {
                 if (blueprint.IsHovered)
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 24f88bf36d..01e23bafc5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -24,6 +24,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -224,7 +225,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="state">The input state at the point of selection.</param>
         internal void HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
         {
-            if (state.Keyboard.ControlPressed)
+            if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
+                EditorBeatmap.Remove(blueprint.HitObject);
+            else if (state.Keyboard.ControlPressed && state.Mouse.IsPressed(MouseButton.Left))
                 blueprint.ToggleSelection();
             else
                 ensureSelected(blueprint);