Merge branch 'ThePhantomMask-ImprovementSlider'

2026-08-04 19:05:14 +02:00
parent 7097bda54e bae31b0d50
commit d16d417548
1 changed files with 134 additions and 28 deletions
@@ -1,6 +1,7 @@
 // Copyright (c) Wojciech Figat. All rights reserved.

 using System;
+using System.Collections.Generic;

 namespace FlaxEngine.GUI;

@@ -101,6 +102,7 @@ public class Slider : ContainerControl
    private Float2 _thumbSize = new Float2(16, 16);
    private bool _isSliding;
    private bool _mouseOverThumb;
+    private const float _step = 10;

    /// <summary>
    /// Gets or sets the value (normalized to range 0-100).
@@ -340,6 +342,13 @@ public class Slider : ContainerControl
        }
    }

+    private void StartSliding()
+    {
+        _isSliding = true;
+        StartMouseCapture();
+        SlidingStart?.Invoke();
+    }
+
    private void EndSliding()
    {
        _isSliding = false;
@@ -409,38 +418,84 @@ public class Slider : ContainerControl
    }

    /// <inheritdoc />
-    public override bool OnMouseDown(Float2 location, MouseButton button)
+    public override Control OnNavigate(NavDirection direction, Float2 location, Control caller, List<Control> visited)
    {
-        if (button == MouseButton.Left)
-        {
-            Focus();
-            float mousePosition = Direction is SliderDirection.HorizontalRight or SliderDirection.HorizontalLeft ? location.X : location.Y;
+        // Auto-focus self when navigation comes in
+        if (!IsNavFocused)
+            return this;

-            if (_thumbRect.Contains(ref location))
-            {
-                // Start sliding
-                _isSliding = true;
-                StartMouseCapture();
-                SlidingStart?.Invoke();
-                return true;
-            }
-            else
-            {
-                // Click change
-                switch (Direction)
-                {
-                case SliderDirection.HorizontalRight or SliderDirection.VerticalDown:
-                    Value += (mousePosition < _thumbCenter ? -1 : 1) * 10;
-                    break;
-                case SliderDirection.HorizontalLeft or SliderDirection.VerticalUp:
-                    Value -= (mousePosition < _thumbCenter ? -1 : 1) * 10;
-                    break;
-                default: break;
-                }
-            }
+        // Control slider via navigation actions
+        if (IsNavFocused && _isSliding)
+        {
+            var isNavUp = direction == NavDirection.Right || direction == NavDirection.Up;
+            var isDirUp = _direction == SliderDirection.HorizontalRight || _direction == SliderDirection.VerticalUp;
+            Value += (isNavUp == isDirUp ? 1 : -1) * _step;
+            return this;
        }

-        return base.OnMouseDown(location, button);
+        return base.OnNavigate(direction, location, caller, visited);
+    }
+
+    /// <inheritdoc />
+    public override bool OnKeyDown(KeyboardKeys key)
+    {
+        if (key == KeyboardKeys.Escape)
+        {
+            Defocus();
+            return true;
+        }
+
+        return base.OnKeyDown(key);
+    }
+
+    private void OnClick(Float2 location)
+    {
+        Focus();
+        float mousePosition = Direction is SliderDirection.HorizontalRight or SliderDirection.HorizontalLeft ? location.X : location.Y;
+
+        if (_thumbRect.Contains(ref location))
+        {
+            StartSliding();
+        }
+        else
+        {
+            // Click change
+            switch (Direction)
+            {
+            case SliderDirection.HorizontalRight or SliderDirection.VerticalDown:
+                Value += (mousePosition < _thumbCenter ? -1 : 1) * _step;
+                break;
+            case SliderDirection.HorizontalLeft or SliderDirection.VerticalUp:
+                Value -= (mousePosition < _thumbCenter ? -1 : 1) * _step;
+                break;
+            default: break;
+            }
+        }
+    }
+
+    /// <inheritdoc />
+    public override bool OnMouseDown(Float2 location, MouseButton button)
+    {
+        if (base.OnMouseDown(location, button))
+            return true;
+
+        if (button == MouseButton.Left)
+        {
+            OnClick(location);
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public override bool OnTouchDown(Float2 location, int pointerId)
+    {
+        if (base.OnTouchDown(location, pointerId))
+            return true;
+
+        OnClick(location);
+        return true;
    }

    /// <inheritdoc />
@@ -474,6 +529,18 @@ public class Slider : ContainerControl
        }
    }

+    /// <inheritdoc />
+    public override void OnKeyUp(KeyboardKeys key)
+    {
+        if (key == KeyboardKeys.Escape && _isSliding)
+        {
+            EndSliding();
+            return;
+        }
+
+        base.OnKeyUp(key);
+    }
+
    /// <inheritdoc />
    public override bool OnMouseUp(Float2 location, MouseButton button)
    {
@@ -486,6 +553,45 @@ public class Slider : ContainerControl
        return base.OnMouseUp(location, button);
    }

+    /// <inheritdoc />
+    public override bool OnTouchUp(Float2 location, int pointerId)
+    {
+        if (base.OnTouchUp(location, pointerId))
+            return true;
+
+        if (_isSliding)
+        {
+            EndSliding();
+        }
+        return true;
+    }
+
+    /// <inheritdoc />
+    public override void OnTouchMove(Float2 location, int pointerId)
+    {
+        base.OnTouchMove(location, pointerId);
+
+        if (_isSliding)
+        {
+            OnMouseMove(location);
+        }
+    }
+
+    /// <inheritdoc />
+    public override void OnSubmit()
+    {
+        base.OnSubmit();
+
+        if (_isSliding)
+        {
+            EndSliding();
+        }
+        else
+        {
+            StartSliding();
+        }
+    }
+
    /// <inheritdoc />
    public override void OnEndMouseCapture()
    {