chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #202 from AlvinRey/main

Browse Source 
修复RangeSlider中，因鼠标移动速度过快而使Thumb无法重合的问题
This commit is contained in:
Dong Bin
2024-04-02 18:12:30 +08:00
committed by GitHub
parent 90c1a64be3 258a8f0bf6
commit 4a192d24c5
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Ursa/Controls/RangeSlider/RangeSlider.cs
View File

@@ -212,15 +212,17 @@ public class RangeSlider: TemplatedControl
{ {
if (_track is null) return; if (_track is null) return;
var value = GetValueByPoint(posOnTrack); var value = GetValueByPoint(posOnTrack);
var thumb = GetThumbByPoint(posOnTrack); var thumb = _isDragging ? _currentThumb : GetThumbByPoint(posOnTrack);
if (_currentThumb !=null && _currentThumb != thumb) return; if (_currentThumb !=null && _currentThumb != thumb) return;
if (thumb is null) return; if (thumb is null) return;
if (thumb == _track.LowerThumb) if (thumb == _track.LowerThumb)
{ {
if (UpperValue < value) SetCurrentValue(UpperValueProperty, IsSnapToTick ? SnapToTick(value) : value);
SetCurrentValue(LowerValueProperty, IsSnapToTick ? SnapToTick(value) : value); SetCurrentValue(LowerValueProperty, IsSnapToTick ? SnapToTick(value) : value);
} }
else else
{ {
if (LowerValue > value) SetCurrentValue(LowerValueProperty, IsSnapToTick ? SnapToTick(value) : value);
SetCurrentValue(UpperValueProperty, IsSnapToTick ? SnapToTick(value) : value); SetCurrentValue(UpperValueProperty, IsSnapToTick ? SnapToTick(value) : value);
} }
} }
@@ -269,6 +271,7 @@ public class RangeSlider: TemplatedControl
var isHorizontal = Orientation == Orientation.Horizontal; var isHorizontal = Orientation == Orientation.Horizontal;
var lowerThumbPosition = isHorizontal? _track?.LowerThumb?.Bounds.Center.X : _track?.LowerThumb?.Bounds.Center.Y; 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 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 pointerPosition = isHorizontal? point.Position.X : point.Position.Y;
var lowerDistance = Math.Abs((lowerThumbPosition ?? 0) - pointerPosition); var lowerDistance = Math.Abs((lowerThumbPosition ?? 0) - pointerPosition);
@@ -278,10 +281,12 @@ public class RangeSlider: TemplatedControl
{ {
return _track?.LowerThumb; return _track?.LowerThumb;
} }
else if(lowerDistance>upperDistance)
{ {
return _track?.UpperThumb; return _track?.UpperThumb;
} }
if (IsDirectionReversed) return pointerPosition < mid ? _track?.LowerThumb : _track?.UpperThumb;
return pointerPosition > mid ? _track?.LowerThumb : _track?.UpperThumb;
} }
private double GetValueByPoint(PointerPoint point) private double GetValueByPoint(PointerPoint point)