Merge pull request #6565 from Kruchji/relative-drag-click-fix

Fix second button click moving slider while dragging

Author: bdach

osu.Framework.Tests/Visual/UserInterface/TestSceneSliderBar.cs

@@ -299,6 +299,36 @@ public void TestRelativeClick()
             checkValue(0);
         }
 
+        [Test]
+        public void TestClickSecondButtonWhileRelativeDragging()
+        {
+            checkValue(0);
+
+            AddStep("Move Cursor", () => { InputManager.MoveMouseTo(sliderBarWithNub.ToScreenSpace(sliderBarWithNub.DrawSize * new Vector2(0.6f, 0.5f))); });
+            AddStep("Click", () => { InputManager.PressButton(MouseButton.Left); });
+            AddStep("Drag", () => { InputManager.MoveMouseTo(sliderBarWithNub.ToScreenSpace(sliderBarWithNub.DrawSize * new Vector2(0.25f, 0.5f))); });
+            AddStep("Second Button Click", () => { InputManager.Click(MouseButton.Right); });
+            AddStep("Drag", () => { InputManager.MoveMouseTo(sliderBarWithNub.ToScreenSpace(sliderBarWithNub.DrawSize * new Vector2(0.3f, 0.5f))); });
+            AddStep("Release Click", () => { InputManager.ReleaseButton(MouseButton.Left); });
+
+            checkValue(-6);
+        }
+
+        [Test]
+        public void TestClickSecondButtonWhileAbsoluteDragging()
+        {
+            checkValue(0);
+
+            AddStep("Move Cursor", () => { InputManager.MoveMouseTo(sliderBarWithNub.ToScreenSpace(sliderBarWithNub.DrawSize * new Vector2(0.8f, 0.5f))); });
+            AddStep("Click", () => { InputManager.PressButton(MouseButton.Left); });
+            AddStep("Drag", () => { InputManager.MoveMouseTo(sliderBarWithNub.ToScreenSpace(sliderBarWithNub.DrawSize * new Vector2(0.25f, 0.5f))); });
+            AddStep("Second Button Click", () => { InputManager.Click(MouseButton.Right); });
+            AddStep("Drag", () => { InputManager.MoveMouseTo(sliderBarWithNub.ToScreenSpace(sliderBarWithNub.DrawSize * new Vector2(0.3f, 0.5f))); });
+            AddStep("Release Click", () => { InputManager.ReleaseButton(MouseButton.Left); });
+
+            checkValue(-4);
+        }
+
         private void checkValue(int expected) =>
             AddAssert($"Value == {expected}", () => sliderBarValue.Value, () => Is.EqualTo(expected).Within(Precision.FLOAT_EPSILON));
 

osu.Framework/Graphics/UserInterface/SliderBar.cs

@@ -119,6 +119,10 @@ protected override void LoadComplete()
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
+            // Relative value at MouseDown shouldn't change until dragging ends.
+            if (IsDragged)
+                return base.OnMouseDown(e);
+
             if (ShouldHandleAsRelativeDrag(e))
             {
                 float min = float.CreateTruncating(currentNumberInstantaneous.MinValue);
@@ -171,7 +175,10 @@ protected override bool OnDragStart(DragStartEvent e)
             return true;
         }
 
-        protected override void OnDragEnd(DragEndEvent e) => Commit();
+        protected override void OnDragEnd(DragEndEvent e)
+        {
+            Commit();
+        }
 
         public override bool AcceptsFocus => true;