Browse Source

Fix slider behaviour for bigger thumbs

Thumb now moves synchronously with pointer instead of relativ to track position.
pull/7016/head
Jan-Peter Zurek 5 years ago
parent
commit
c43ee1c52d
  1. 17
      src/Avalonia.Controls/Slider.cs

17
src/Avalonia.Controls/Slider.cs

@ -331,16 +331,17 @@ namespace Avalonia.Controls
} }
} }
private void MoveToPoint(PointerPoint x) private void MoveToPoint(PointerPoint posOnTrack)
{ {
var orient = Orientation == Orientation.Horizontal; var orient = Orientation == Orientation.Horizontal;
var thumbLength = (orient
var pointDen = orient ? _track.Bounds.Width : _track.Bounds.Height; ? _track.Thumb.Bounds.Width
// Just add epsilon to avoid NaN in case 0/0 : _track.Thumb.Bounds.Height) + double.Epsilon;
pointDen += double.Epsilon; var trackLength = (orient
? _track.Bounds.Width
var pointNum = orient ? x.Position.X : x.Position.Y; : _track.Bounds.Height) - thumbLength;
var logicalPos = MathUtilities.Clamp(pointNum / pointDen, 0.0d, 1.0d); var trackPos = orient ? posOnTrack.Position.X : posOnTrack.Position.Y;
var logicalPos = MathUtilities.Clamp((trackPos - thumbLength * 0.5) / trackLength, 0.0d, 1.0d);
var invert = orient ? var invert = orient ?
IsDirectionReversed ? 1 : 0 : IsDirectionReversed ? 1 : 0 :
IsDirectionReversed ? 0 : 1; IsDirectionReversed ? 0 : 1;

Loading…
Cancel
Save