From 8d50b155e8022f43bca1a9c824ee8697aa4acf70 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 31 Oct 2019 17:13:10 +0900
Subject: [PATCH] Make selection happen on click only

---
 .../Components/PathControlPointPiece.cs       | 25 ++++++++++++++--
 .../Components/PathControlPointVisualiser.cs  | 30 ++++++++++---------
 2 files changed, 39 insertions(+), 16 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 3b0b9bce1f..bd6a905b38 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -18,9 +18,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
     public class PathControlPointPiece : BlueprintPiece<Slider>
     {
+        public Action<int> RequestSelection;
         public Action<Vector2[]> ControlPointsChanged;
-        public readonly Bindable<bool> IsSelected = new Bindable<bool>();
 
+        public readonly Bindable<bool> IsSelected = new Bindable<bool>();
         public readonly int Index;
 
         private readonly Slider slider;
@@ -28,6 +29,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         private readonly Container marker;
         private readonly Drawable markerRing;
 
+        private bool isClicked;
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -98,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             markerRing.Alpha = IsSelected.Value ? 1 : 0;
 
             Color4 colour = isSegmentSeparator ? colours.Red : colours.Yellow;
-            if (IsHovered || IsSelected.Value)
+            if (IsHovered || isClicked || IsSelected.Value)
                 colour = Color4.White;
             marker.Colour = colour;
         }
@@ -122,6 +125,24 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         // The connecting path is excluded from positional input
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => marker.ReceivePositionalInputAt(screenSpacePos);
 
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            isClicked = true;
+            return true;
+        }
+
+        protected override bool OnMouseUp(MouseUpEvent e)
+        {
+            isClicked = false;
+            return true;
+        }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            RequestSelection?.Invoke(Index);
+            return true;
+        }
+
         protected override bool OnDragStart(DragStartEvent e) => true;
 
         protected override bool OnDrag(DragEvent e)
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 6efa0ef550..160168eb37 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -32,27 +32,29 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             base.Update();
 
             while (slider.Path.ControlPoints.Length > Pieces.Count)
-                Pieces.Add(new PathControlPointPiece(slider, Pieces.Count) { ControlPointsChanged = c => ControlPointsChanged?.Invoke(c) });
+            {
+                Pieces.Add(new PathControlPointPiece(slider, Pieces.Count)
+                {
+                    ControlPointsChanged = c => ControlPointsChanged?.Invoke(c),
+                    RequestSelection = selectPiece
+                });
+            }
+
             while (slider.Path.ControlPoints.Length < Pieces.Count)
                 Pieces.Remove(Pieces[Pieces.Count - 1]);
         }
 
-        protected override bool OnMouseDown(MouseDownEvent e)
+        protected override bool OnClick(ClickEvent e)
         {
-            bool anySelected = false;
-
             foreach (var piece in Pieces)
-            {
-                if (piece.IsHovered)
-                {
-                    piece.IsSelected.Value = true;
-                    anySelected = true;
-                }
-                else
-                    piece.IsSelected.Value = false;
-            }
+                piece.IsSelected.Value = false;
+            return false;
+        }
 
-            return anySelected;
+        private void selectPiece(int index)
+        {
+            foreach (var piece in Pieces)
+                piece.IsSelected.Value = piece.Index == index;
         }
     }
 }