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

Merge branch 'main' of github.com:AlvinRey/Ursa.Avalonia into TimeBox

Browse Source
This commit is contained in:
LiWenhao
2024-04-06 21:44:30 +08:00
parent 72d962ab45 f8a11b0f3e
commit a03591516a
4 changed files with 825 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ursa/Controls/IPv4Box.cs
View File

@@ -210,7 +210,7 @@ public class IPv4Box: TemplatedControl
if (!char.IsNumber(s![0])) return;
if (_currentActivePresenter != null)
{
int index = _currentActivePresenter.CaretIndex;
int index = Math.Min(_currentActivePresenter.CaretIndex, _currentActivePresenter.Text.Length);
string? oldText = _currentActivePresenter.Text;
if (oldText is null)
{

84
src/Ursa/Controls/NumericUpDown/IntUpDown.cs
View File

@@ -25,9 +25,17 @@ public class NumericIntUpDown : NumericUpDownBase<int>
protected override int Zero => 0;
protected override int? Add(int? a, int? b) => a + b;
protected override int? Add(int? a, int? b)
{
var result = a + b;
return result < Value ? Maximum : result;
}
protected override int? Minus(int? a, int? b) => a - b;
protected override int? Minus(int? a, int? b)
{
var result = a - b;
return result > Value ? Minimum : result;
}
}
public class NumericUIntUpDown : NumericUpDownBase<uint>
@@ -53,9 +61,17 @@ public class NumericUIntUpDown : NumericUpDownBase<uint>
protected override uint Zero => 0;
protected override uint? Add(uint? a, uint? b) => a + b;
protected override uint? Add(uint? a, uint? b)
{
var result = a + b;
return result < Value ? Maximum : result;
}
protected override uint? Minus(uint? a, uint? b) => a - b;
protected override uint? Minus(uint? a, uint? b)
{
var result = a - b;
return result > Value ? Minimum : result;
}
}
public class NumericDoubleUpDown : NumericUpDownBase<double>
@@ -99,9 +115,17 @@ public class NumericByteUpDown : NumericUpDownBase<byte>
protected override byte Zero => 0;
protected override byte? Add(byte? a, byte? b) => (byte?)(a + b);
protected override byte? Add(byte? a, byte? b)
{
var result = a + b;
return (byte?)(result < Value ? Maximum : result);
}
protected override byte? Minus(byte? a, byte? b) => (byte?)(a - b);
protected override byte? Minus(byte? a, byte? b)
{
var result = a - b;
return (byte?)(result > Value ? Minimum : result);
}
}
public class NumericSByteUpDown : NumericUpDownBase<sbyte>
@@ -122,9 +146,17 @@ public class NumericSByteUpDown : NumericUpDownBase<sbyte>
protected override sbyte Zero => 0;
protected override sbyte? Add(sbyte? a, sbyte? b) => (sbyte?)(a + b);
protected override sbyte? Add(sbyte? a, sbyte? b)
{
var result = a + b;
return (sbyte?)(result < Value ? Maximum : result);
}
protected override sbyte? Minus(sbyte? a, sbyte? b) => (sbyte?)(a - b);
protected override sbyte? Minus(sbyte? a, sbyte? b)
{
var result = a - b;
return (sbyte?)(result > Value ? Minimum : result);
}
}
public class NumericShortUpDown : NumericUpDownBase<short>
@@ -145,9 +177,17 @@ public class NumericShortUpDown : NumericUpDownBase<short>
protected override short Zero => 0;
protected override short? Add(short? a, short? b) => (short?)(a + b);
protected override short? Add(short? a, short? b)
{
var result = a + b;
return (short?)(result < Value ? Maximum : result);
}
protected override short? Minus(short? a, short? b) => (short?)(a - b);
protected override short? Minus(short? a, short? b)
{
var result = a - b;
return (short?)(result > Value ? Minimum : result);
}
}
public class NumericUShortUpDown : NumericUpDownBase<ushort>
@@ -168,9 +208,17 @@ public class NumericUShortUpDown : NumericUpDownBase<ushort>
protected override ushort Zero => 0;
protected override ushort? Add(ushort? a, ushort? b) => (ushort?)(a + b);
protected override ushort? Add(ushort? a, ushort? b)
{
var result = a + b;
return (ushort?)(result < Value ? Maximum : result);
}
protected override ushort? Minus(ushort? a, ushort? b) => (ushort?)(a - b);
protected override ushort? Minus(ushort? a, ushort? b)
{
var result = a - b;
return (ushort?)(result > Value ? Minimum : result);
}
}
public class NumericLongUpDown : NumericUpDownBase<long>
@@ -191,9 +239,17 @@ public class NumericLongUpDown : NumericUpDownBase<long>
protected override long Zero => 0;
protected override long? Add(long? a, long? b) => a + b;
protected override long? Add(long? a, long? b)
{
var result = a + b;
return result < Value ? Maximum : result;
}
protected override long? Minus(long? a, long? b) => a - b;
protected override long? Minus(long? a, long? b)
{
var result = a - b;
return result > Value ? Minimum : result;
}
}
public class NumericULongUpDown : NumericUpDownBase<ulong>

1499
src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
View File

File diff suppressed because it is too large Load Diff

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

@@ -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)