fix: minor fixes.

This commit is contained in:
rabbitism
2024-01-15 01:23:00 +08:00
parent f895ea6a89
commit d3c54f3088
2 changed files with 24 additions and 64 deletions

View File

@@ -15,12 +15,8 @@ public class NumericIntUpDown : NumericUpDownBase<int>
StepProperty.OverrideDefaultValue<NumericIntUpDown>(1); StepProperty.OverrideDefaultValue<NumericIntUpDown>(1);
} }
protected override bool ParseText(string? text, out int? number) protected override bool ParseText(string? text, out int number) =>
{ int.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
var result = int.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}
protected override string? ValueToString(int? value) => value?.ToString(FormatString, NumberFormat); protected override string? ValueToString(int? value) => value?.ToString(FormatString, NumberFormat);
@@ -42,12 +38,8 @@ public class NumericDoubleUpDown : NumericUpDownBase<double>
StepProperty.OverrideDefaultValue<NumericDoubleUpDown>(1); StepProperty.OverrideDefaultValue<NumericDoubleUpDown>(1);
} }
protected override bool ParseText(string? text, out double? number) protected override bool ParseText(string? text, out double number) =>
{ double.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
var result = double.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}
protected override string? ValueToString(double? value) => value?.ToString(FormatString, NumberFormat); protected override string? ValueToString(double? value) => value?.ToString(FormatString, NumberFormat);
@@ -69,12 +61,8 @@ public class NumericByteUpDown : NumericUpDownBase<byte>
StepProperty.OverrideDefaultValue<NumericByteUpDown>(1); StepProperty.OverrideDefaultValue<NumericByteUpDown>(1);
} }
protected override bool ParseText(string? text, out byte? number) protected override bool ParseText(string? text, out byte number) =>
{ byte.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
var result = byte.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}
protected override string? ValueToString(byte? value) => value?.ToString(FormatString, NumberFormat); protected override string? ValueToString(byte? value) => value?.ToString(FormatString, NumberFormat);
@@ -96,12 +84,8 @@ public class NumericSByteUpDown : NumericUpDownBase<sbyte>
StepProperty.OverrideDefaultValue<NumericSByteUpDown>(1); StepProperty.OverrideDefaultValue<NumericSByteUpDown>(1);
} }
protected override bool ParseText(string? text, out sbyte? number) protected override bool ParseText(string? text, out sbyte number) =>
{ sbyte.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
var result = sbyte.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}
protected override string? ValueToString(sbyte? value) => value?.ToString(FormatString, NumberFormat); protected override string? ValueToString(sbyte? value) => value?.ToString(FormatString, NumberFormat);
@@ -123,12 +107,8 @@ public class NumericShortUpDown : NumericUpDownBase<short>
StepProperty.OverrideDefaultValue<NumericShortUpDown>(1); StepProperty.OverrideDefaultValue<NumericShortUpDown>(1);
} }
protected override bool ParseText(string? text, out short? number) protected override bool ParseText(string? text, out short number) =>
{ short.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
var result = short.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}
protected override string? ValueToString(short? value) => value?.ToString(FormatString, NumberFormat); protected override string? ValueToString(short? value) => value?.ToString(FormatString, NumberFormat);
@@ -150,12 +130,8 @@ public class NumericUShortUpDown : NumericUpDownBase<ushort>
StepProperty.OverrideDefaultValue<NumericUShortUpDown>(1); StepProperty.OverrideDefaultValue<NumericUShortUpDown>(1);
} }
protected override bool ParseText(string? text, out ushort? number) protected override bool ParseText(string? text, out ushort number) =>
{ ushort.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
var result = ushort.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}
protected override string? ValueToString(ushort? value) => value?.ToString(FormatString, NumberFormat); protected override string? ValueToString(ushort? value) => value?.ToString(FormatString, NumberFormat);
@@ -177,12 +153,8 @@ public class NumericLongUpDown : NumericUpDownBase<long>
StepProperty.OverrideDefaultValue<NumericLongUpDown>(1); StepProperty.OverrideDefaultValue<NumericLongUpDown>(1);
} }
protected override bool ParseText(string? text, out long? number) protected override bool ParseText(string? text, out long number) =>
{ long.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
var result = long.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}
protected override string? ValueToString(long? value) => value?.ToString(FormatString, NumberFormat); protected override string? ValueToString(long? value) => value?.ToString(FormatString, NumberFormat);
@@ -204,12 +176,8 @@ public class NumericULongUpDown : NumericUpDownBase<ulong>
StepProperty.OverrideDefaultValue<NumericULongUpDown>(1); StepProperty.OverrideDefaultValue<NumericULongUpDown>(1);
} }
protected override bool ParseText(string? text, out ulong? number) protected override bool ParseText(string? text, out ulong number) =>
{ ulong.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
var result = ulong.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}
protected override string? ValueToString(ulong? value) => value?.ToString(FormatString, NumberFormat); protected override string? ValueToString(ulong? value) => value?.ToString(FormatString, NumberFormat);
@@ -231,12 +199,8 @@ public class NumericFloatUpDown : NumericUpDownBase<float>
StepProperty.OverrideDefaultValue<NumericFloatUpDown>(1); StepProperty.OverrideDefaultValue<NumericFloatUpDown>(1);
} }
protected override bool ParseText(string? text, out float? number) protected override bool ParseText(string? text, out float number) =>
{ float.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
var result = float.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}
protected override string? ValueToString(float? value) => value?.ToString(FormatString, NumberFormat); protected override string? ValueToString(float? value) => value?.ToString(FormatString, NumberFormat);
@@ -258,12 +222,8 @@ public class NumericDecimalUpDown : NumericUpDownBase<decimal>
StepProperty.OverrideDefaultValue<NumericDecimalUpDown>(1); StepProperty.OverrideDefaultValue<NumericDecimalUpDown>(1);
} }
protected override bool ParseText(string? text, out decimal? number) protected override bool ParseText(string? text, out decimal number) =>
{ decimal.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
var result = decimal.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}
protected override string? ValueToString(decimal? value) => value?.ToString(FormatString, NumberFormat); protected override string? ValueToString(decimal? value) => value?.ToString(FormatString, NumberFormat);

View File

@@ -449,11 +449,11 @@ public abstract class NumericUpDownBase<T>: NumericUpDown where T: struct, IComp
} }
if (value.Value.CompareTo(max) > 0) if (value.Value.CompareTo(max) > 0)
{ {
return Maximum; return max;
} }
if (value.Value.CompareTo(min) < 0) if (value.Value.CompareTo(min) < 0)
{ {
return Minimum; return min;
} }
return value; return value;
} }
@@ -520,7 +520,7 @@ public abstract class NumericUpDownBase<T>: NumericUpDown where T: struct, IComp
if (_textBox!= null && !Equals(_textBox.Text, newText)) if (_textBox!= null && !Equals(_textBox.Text, newText))
{ {
_textBox.Text = newText; _textBox.Text = newText;
_textBox.CaretIndex = newText?.Length??0; _textBox.CaretIndex = newText?.Length ?? 0;
} }
} }
} }
@@ -609,7 +609,7 @@ public abstract class NumericUpDownBase<T>: NumericUpDown where T: struct, IComp
SetCurrentValue(ValueProperty, Clamp(value, Maximum, Minimum)); SetCurrentValue(ValueProperty, Clamp(value, Maximum, Minimum));
} }
protected abstract bool ParseText(string? text, out T? number); protected abstract bool ParseText(string? text, out T number);
protected abstract string? ValueToString(T? value); protected abstract string? ValueToString(T? value);
protected abstract T Zero { get; } protected abstract T Zero { get; }
protected abstract T? Add(T? a, T? b); protected abstract T? Add(T? a, T? b);