From 258a8f0bf6ff6bece18729fba9e4fca7b2e95461 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Tue, 2 Apr 2024 18:11:48 +0800 Subject: [PATCH] feat: make an assumption that user want to drag to opposite direction when two thumbs overlap. --- src/Ursa/Controls/RangeSlider/RangeSlider.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Ursa/Controls/RangeSlider/RangeSlider.cs b/src/Ursa/Controls/RangeSlider/RangeSlider.cs index 70b21ff..e7351ad 100644 --- a/src/Ursa/Controls/RangeSlider/RangeSlider.cs +++ b/src/Ursa/Controls/RangeSlider/RangeSlider.cs @@ -271,6 +271,7 @@ public class RangeSlider: TemplatedControl var isHorizontal = Orientation == Orientation.Horizontal; var lowerThumbPosition = isHorizontal? _track?.LowerThumb?.Bounds.Center.X : _track?.LowerThumb?.Bounds.Center.Y; var upperThumbPosition = isHorizontal? _track?.UpperThumb?.Bounds.Center.X : _track?.UpperThumb?.Bounds.Center.Y; + var mid = isHorizontal? _track?.Bounds.Center.X : _track?.Bounds.Center.Y; var pointerPosition = isHorizontal? point.Position.X : point.Position.Y; var lowerDistance = Math.Abs((lowerThumbPosition ?? 0) - pointerPosition); @@ -280,10 +281,12 @@ public class RangeSlider: TemplatedControl { return _track?.LowerThumb; } - else + if(lowerDistance>upperDistance) { return _track?.UpperThumb; } + if (IsDirectionReversed) return pointerPosition < mid ? _track?.LowerThumb : _track?.UpperThumb; + return pointerPosition > mid ? _track?.LowerThumb : _track?.UpperThumb; } private double GetValueByPoint(PointerPoint point)