From c56503ee88c2969c90df8a5679774f870371782e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 13 Nov 2019 17:28:18 +0900
Subject: [PATCH] Select single control point on right click

---
 .../Components/PathControlPointPiece.cs       | 20 ++++++++++++-------
 .../Components/PathControlPointVisualiser.cs  |  5 +++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 70b4842089..0ccf020300 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
     public class PathControlPointPiece : BlueprintPiece<Slider>
     {
-        public Action<int> RequestSelection;
+        public Action<int, MouseButtonEvent> RequestSelection;
         public Action<Vector2[]> ControlPointsChanged;
 
         public readonly BindableBool IsSelected = new BindableBool();
@@ -130,21 +130,27 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (e.Button != MouseButton.Left)
+            if (RequestSelection == null)
                 return false;
 
-            if (RequestSelection != null)
+            switch (e.Button)
             {
-                RequestSelection.Invoke(Index);
-                return true;
+                case MouseButton.Left:
+                    RequestSelection.Invoke(Index, e);
+                    return true;
+
+                case MouseButton.Right:
+                    if (!IsSelected.Value)
+                        RequestSelection.Invoke(Index, e);
+                    return false; // Allow context menu to show
             }
 
             return false;
         }
 
-        protected override bool OnMouseUp(MouseUpEvent e) => e.Button == MouseButton.Left && RequestSelection != null;
+        protected override bool OnMouseUp(MouseUpEvent e) => RequestSelection != null;
 
-        protected override bool OnClick(ClickEvent e) => e.Button == MouseButton.Left && RequestSelection != null;
+        protected override bool OnClick(ClickEvent e) => RequestSelection != null;
 
         protected override bool OnDragStart(DragStartEvent e) => e.Button == MouseButton.Left;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index fd14e6dc23..97c756417c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
@@ -90,9 +91,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         public bool OnReleased(PlatformAction action) => action.ActionMethod == PlatformActionMethod.Delete;
 
-        private void selectPiece(int index)
+        private void selectPiece(int index, MouseButtonEvent e)
         {
-            if (inputManager.CurrentState.Keyboard.ControlPressed)
+            if (e.Button == MouseButton.Left && inputManager.CurrentState.Keyboard.ControlPressed)
                 Pieces[index].IsSelected.Toggle();
             else
             {