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

fix: fix vertical direction issue.

Browse Source
This commit is contained in:
Zhang Dian
2024-01-22 16:09:07 +08:00
parent d2f01c1257
commit 2563b96017
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/Ursa/Controls/RangeSlider/RangeTrack.cs
View File

@@ -305,26 +305,6 @@ public class RangeTrack: Control
CoerceLength(ref lowerThumbLength, finalSize.Height); CoerceLength(ref lowerThumbLength, finalSize.Height);
CoerceLength(ref upperThumbLength, finalSize.Height); CoerceLength(ref upperThumbLength, finalSize.Height);
if (IsDirectionReversed) if (IsDirectionReversed)
{
offset = offset.WithY(upperThumbLength * 0.5);
pieceSize = pieceSize.WithHeight(upperButtonLength);
UpperSection?.Arrange(new Rect(offset, pieceSize));
offset = offset.WithY(offset.Y + upperButtonLength);
pieceSize = pieceSize.WithHeight(innerButtonLength);
InnerSection?.Arrange(new Rect(offset, pieceSize));
offset = offset.WithY(offset.Y + innerButtonLength);
pieceSize = pieceSize.WithHeight(lowerButtonLength);
LowerSection?.Arrange(new Rect(offset, pieceSize));
offset = offset.WithY(upperButtonLength);
pieceSize = pieceSize.WithHeight(upperThumbLength);
UpperThumb?.Arrange(new Rect(offset, pieceSize));
offset = offset.WithY(upperButtonLength+innerButtonLength);
pieceSize = pieceSize.WithHeight(lowerThumbLength);
LowerThumb?.Arrange(new Rect(offset, pieceSize));
}
else
{ {
offset = offset.WithY(lowerThumbLength * 0.5); offset = offset.WithY(lowerThumbLength * 0.5);
pieceSize = pieceSize.WithHeight(lowerButtonLength); pieceSize = pieceSize.WithHeight(lowerButtonLength);
@@ -344,6 +324,26 @@ public class RangeTrack: Control
pieceSize = pieceSize.WithHeight(upperThumbLength); pieceSize = pieceSize.WithHeight(upperThumbLength);
UpperThumb?.Arrange(new Rect(offset, pieceSize)); UpperThumb?.Arrange(new Rect(offset, pieceSize));
} }
else
{
offset = offset.WithY(upperThumbLength * 0.5);
pieceSize = pieceSize.WithHeight(upperButtonLength);
UpperSection?.Arrange(new Rect(offset, pieceSize));
offset = offset.WithY(offset.Y + upperButtonLength);
pieceSize = pieceSize.WithHeight(innerButtonLength);
InnerSection?.Arrange(new Rect(offset, pieceSize));
offset = offset.WithY(offset.Y + innerButtonLength);
pieceSize = pieceSize.WithHeight(lowerButtonLength);
LowerSection?.Arrange(new Rect(offset, pieceSize));
offset = offset.WithY(upperButtonLength);
pieceSize = pieceSize.WithHeight(upperThumbLength);
UpperThumb?.Arrange(new Rect(offset, pieceSize));
offset = offset.WithY(upperButtonLength + innerButtonLength);
pieceSize = pieceSize.WithHeight(lowerThumbLength);
LowerThumb?.Arrange(new Rect(offset, pieceSize));
}
} }
else else
{ {
@@ -485,22 +485,22 @@ public class RangeTrack: Control
{ {
if (IsDirectionReversed) if (IsDirectionReversed)
{ {
double trackStart = UpperThumb?.Bounds.Height/2 ?? 0; double trackStart = LowerThumb?.Bounds.Height / 2 ?? 0;
double trackEnd = trackStart + range;
if (position < trackStart) return 1.0;
if (position > trackEnd) return 0.0;
double diff = trackEnd - position;
return diff / range;
}
else
{
double trackStart = LowerThumb?.Bounds.Height/2 ?? 0;
double trackEnd = trackStart + range; double trackEnd = trackStart + range;
if (position < trackStart) return 0.0; if (position < trackStart) return 0.0;
if (position > trackEnd) return 1.0; if (position > trackEnd) return 1.0;
double diff = position - trackStart; double diff = position - trackStart;
return diff / range; return diff / range;
} }
else
{
double trackStart = UpperThumb?.Bounds.Height / 2 ?? 0;
double trackEnd = trackStart + range;
if (position < trackStart) return 1.0;
if (position > trackEnd) return 0.0;
double diff = trackEnd - position;
return diff / range;
}
} }
} }
} }