From cf1e3ea98873897de95984f79846ca7282a7581f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 15:41:21 +0900
Subject: [PATCH 1/2] Add failing test covering quick shift-rightclick deletion
 in placement mode

---
 .../Editing/TestSceneEditorSelection.cs       | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 99f31b0c2a..c9b6d2e376 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
@@ -156,9 +157,35 @@ namespace osu.Game.Tests.Visual.Editing
         }
 
         [Test]
-        public void TestQuickDeleteRemovesObject()
+        public void TestQuickDeleteRemovesObjectInPlacement()
         {
-            var addedObject = new HitCircle { StartTime = 1000 };
+            var addedObject = new HitCircle
+            {
+                StartTime = 0,
+                Position = OsuPlayfield.BASE_SIZE * 0.5f
+            };
+
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            AddStep("enter placement mode", () => InputManager.PressKey(Key.Number2));
+
+            moveMouseToObject(() => addedObject);
+
+            AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
+            AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));
+
+            AddAssert("no hitobjects in beatmap", () => EditorBeatmap.HitObjects.Count == 0);
+        }
+
+        [Test]
+        public void TestQuickDeleteRemovesObjectInSelection()
+        {
+            var addedObject = new HitCircle
+            {
+                StartTime = 0,
+                Position = OsuPlayfield.BASE_SIZE * 0.5f
+            };
 
             AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
 

From 9a7bf8109ff7029ad76e2d60b389d660d062ec57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 15:27:08 +0900
Subject: [PATCH 2/2] Allow certain mouse input to pass through
 `PlacementBlueprints` to the selection logic

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 6c1cd01796..4ad8c815fe 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -128,8 +129,11 @@ namespace osu.Game.Rulesets.Edit
                 case DoubleClickEvent _:
                     return false;
 
-                case MouseButtonEvent _:
-                    return true;
+                case MouseButtonEvent mouse:
+                    // placement blueprints should generally block mouse from reaching underlying components (ie. performing clicks on interface buttons).
+                    // for now, the one exception we want to allow is when using a non-main mouse button when shift is pressed, which is used to trigger object deletion
+                    // while in placement mode.
+                    return mouse.Button == MouseButton.Left || !mouse.ShiftPressed;
 
                 default:
                     return false;