fix: fixed #1050
This commit is contained in:
1 parent
287e5982c4
commit
24af66624f
2 files changed
+39
-26
No files matched your search
@@ -271,16 +271,11 @@ namespace HandyControl.Controls
|
|||||||
var newValue = _track.ValueFromPoint(pt);
|
var newValue = _track.ValueFromPoint(pt);
|
||||||
if (ValidateHelper.IsInRangeOfDouble(newValue))
|
if (ValidateHelper.IsInRangeOfDouble(newValue))
|
||||||
{
|
{
|
||||||
var dir = (ValueStart + ValueEnd) / 2 > newValue;
|
isStart = (ValueStart + ValueEnd) / 2 > newValue;
|
||||||
if (!dir)
|
if (!isStart)
|
||||||
{
|
{
|
||||||
isStart = false;
|
|
||||||
direction = -Math.Abs(direction);
|
direction = -Math.Abs(direction);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
isStart = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,8 +26,6 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
private double Density { get; set; } = double.NaN;
|
private double Density { get; set; } = double.NaN;
|
||||||
|
|
||||||
private double ThumbStartCenterOffset { get; set; } = double.NaN;
|
|
||||||
|
|
||||||
public RepeatButton DecreaseRepeatButton
|
public RepeatButton DecreaseRepeatButton
|
||||||
{
|
{
|
||||||
get => _decreaseButton;
|
get => _decreaseButton;
|
||||||
@@ -257,13 +255,12 @@ namespace HandyControl.Controls
|
|||||||
: increaseButtonLength + thumbStartLength + centerButtonLength;
|
: increaseButtonLength + thumbStartLength + centerButtonLength;
|
||||||
pieceSize.Height = thumbStartLength;
|
pieceSize.Height = thumbStartLength;
|
||||||
|
|
||||||
ThumbStart?.Arrange(new Rect(offset, pieceSize));
|
ArrangeThumb(isDirectionReversed, false, offset, pieceSize);
|
||||||
ThumbStartCenterOffset = offset.Y + thumbStartLength * 0.5;
|
|
||||||
|
|
||||||
offset.Y = isDirectionReversed ? decreaseButtonLength : increaseButtonLength;
|
offset.Y = isDirectionReversed ? decreaseButtonLength : increaseButtonLength;
|
||||||
pieceSize.Height = thumbEndLength;
|
pieceSize.Height = thumbEndLength;
|
||||||
|
|
||||||
ThumbEnd?.Arrange(new Rect(offset, pieceSize));
|
ArrangeThumb(isDirectionReversed, true, offset, pieceSize);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -291,20 +288,45 @@ namespace HandyControl.Controls
|
|||||||
offset.X = isDirectionReversed ? increaseButtonLength : decreaseButtonLength;
|
offset.X = isDirectionReversed ? increaseButtonLength : decreaseButtonLength;
|
||||||
pieceSize.Width = thumbStartLength;
|
pieceSize.Width = thumbStartLength;
|
||||||
|
|
||||||
ThumbStart?.Arrange(new Rect(offset, pieceSize));
|
ArrangeThumb(isDirectionReversed, false, offset, pieceSize);
|
||||||
ThumbStartCenterOffset = offset.X + thumbStartLength * 0.5;
|
|
||||||
|
|
||||||
offset.X = isDirectionReversed
|
offset.X = isDirectionReversed
|
||||||
? increaseButtonLength + thumbStartLength + centerButtonLength
|
? increaseButtonLength + thumbStartLength + centerButtonLength
|
||||||
: decreaseButtonLength + thumbEndLength + centerButtonLength;
|
: decreaseButtonLength + thumbEndLength + centerButtonLength;
|
||||||
pieceSize.Width = thumbEndLength;
|
pieceSize.Width = thumbEndLength;
|
||||||
|
|
||||||
ThumbEnd?.Arrange(new Rect(offset, pieceSize));
|
ArrangeThumb(isDirectionReversed, true, offset, pieceSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
return arrangeSize;
|
return arrangeSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ArrangeThumb(bool isDirectionReversed, bool isStart, Point offset, Size pieceSize)
|
||||||
|
{
|
||||||
|
if (isStart)
|
||||||
|
{
|
||||||
|
if (isDirectionReversed)
|
||||||
|
{
|
||||||
|
ThumbStart?.Arrange(new Rect(offset, pieceSize));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ThumbEnd?.Arrange(new Rect(offset, pieceSize));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (isDirectionReversed)
|
||||||
|
{
|
||||||
|
ThumbEnd?.Arrange(new Rect(offset, pieceSize));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ThumbStart?.Arrange(new Rect(offset, pieceSize));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void ComputeLengths(Size arrangeSize, bool isVertical, out double decreaseButtonLength,
|
private void ComputeLengths(Size arrangeSize, bool isVertical, out double decreaseButtonLength,
|
||||||
out double centerButtonLength, out double increaseButtonLength, out double thumbStartLength,
|
out double centerButtonLength, out double increaseButtonLength, out double thumbStartLength,
|
||||||
out double thumbEndLength)
|
out double thumbEndLength)
|
||||||
@@ -372,17 +394,13 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
public virtual double ValueFromPoint(Point pt)
|
public virtual double ValueFromPoint(Point pt)
|
||||||
{
|
{
|
||||||
double val;
|
return Orientation == Orientation.Horizontal
|
||||||
// Find distance from center of thumb to given point.
|
? !IsDirectionReversed
|
||||||
if (Orientation == Orientation.Horizontal)
|
? pt.X / RenderSize.Width * Maximum
|
||||||
{
|
: (1 - pt.X / RenderSize.Width) * Maximum
|
||||||
val = ValueStart + ValueFromDistance(pt.X - ThumbStartCenterOffset, pt.Y - RenderSize.Height * 0.5);
|
: !IsDirectionReversed
|
||||||
}
|
? pt.Y / RenderSize.Height * Maximum
|
||||||
else
|
: (1 - pt.X / RenderSize.Height) * Maximum;
|
||||||
{
|
|
||||||
val = ValueStart + ValueFromDistance(pt.X - RenderSize.Width * 0.5, pt.Y - ThumbStartCenterOffset);
|
|
||||||
}
|
|
||||||
return Math.Max(Minimum, Math.Min(Maximum, val));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual double ValueFromDistance(double horizontal, double vertical)
|
public virtual double ValueFromDistance(double horizontal, double vertical)
|
||||||
|
|||||||
Reference in new issue
Block a user