tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use "double" instead of "double?" for Value. DefaultValue removed.

pull/1457/head
dzhelnin 9 years ago
parent
e120d9c157
commit
7c0f1f9374
3 changed files with 32 additions and 205 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      samples/ControlCatalog/Pages/NumericUpDownPage.xaml
  2. 2
      samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
  3. 229
      src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs

6
samples/ControlCatalog/Pages/NumericUpDownPage.xaml
View File

@ -19,8 +19,6 @@
<TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="2">ClipValueToMinMax:</TextBlock>
<CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{Binding #upDown.ClipValueToMinMax}" VerticalAlignment="Center" Margin="2"/>
<TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">DisplayDefaultValueOnEmptyText:</TextBlock>
<CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding #upDown.DisplayDefaultValueOnEmptyText}" VerticalAlignment="Center" Margin="2"/>
</Grid>
<Grid Grid.Row="0" Grid.Column="1" Margin="10,2,2,2" ColumnDefinitions="Auto, 120" RowDefinitions="35,35,35,35,35">
<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="2">FormatString:</TextBlock>
@ -68,10 +66,6 @@
<NumericUpDown Grid.Row="3" Grid.Column="1" Value="{Binding #upDown.Value}" VerticalAlignment="Center"
Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
<TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">DefaultValue:</TextBlock>
<NumericUpDown Grid.Row="4" Grid.Column="1" Value="{Binding #upDown.DefaultValue}"
VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
</Grid>
</Grid>

2
samples/ControlCatalog/Pages/NumericUpDownPage.xaml.cs
View File

@ -79,7 +79,7 @@ namespace ControlCatalog.Pages
new CultureInfo("cs-CZ")
};
public FormatObject SelectedFormat
public FormatObject SelectedFormat
{
get { return _selectedFormat; }
set { this.RaiseAndSetIfChanged(ref _selectedFormat, value); }

229
src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
View File

@ -7,6 +7,7 @@ using Avalonia.Data;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Threading;
using Avalonia.Utilities;
namespace Avalonia.Controls
{
@ -47,18 +48,6 @@ namespace Avalonia.Controls
AvaloniaProperty.RegisterDirect<NumericUpDown, CultureInfo>(nameof(CultureInfo), o => o.CultureInfo,
(o, v) => o.CultureInfo = v, CultureInfo.CurrentCulture);
/// <summary>
/// Defines the <see cref="DefaultValue"/> property.
/// </summary>
public static readonly StyledProperty<double?> DefaultValueProperty =
AvaloniaProperty.Register<NumericUpDown, double?>(nameof(DefaultValue));
/// <summary>
/// Defines the <see cref="DisplayDefaultValueOnEmptyText"/> property.
/// </summary>
public static readonly StyledProperty<bool> DisplayDefaultValueOnEmptyTextProperty =
AvaloniaProperty.Register<NumericUpDown, bool>(nameof(DisplayDefaultValueOnEmptyText));
/// <summary>
/// Defines the <see cref="FormatString"/> property.
/// </summary>
@ -106,8 +95,8 @@ namespace Avalonia.Controls
/// <summary>
/// Defines the <see cref="Value"/> property.
/// </summary>
public static readonly DirectProperty<NumericUpDown, double?> ValueProperty =
AvaloniaProperty.RegisterDirect<NumericUpDown, double?>(nameof(Value), updown => updown.Value,
public static readonly DirectProperty<NumericUpDown, double> ValueProperty =
AvaloniaProperty.RegisterDirect<NumericUpDown, double>(nameof(Value), updown => updown.Value,
(updown, v) => updown.Value = v, defaultBindingMode: BindingMode.TwoWay);
/// <summary>
@ -118,7 +107,7 @@ namespace Avalonia.Controls
private IDisposable _textBoxTextChangedSubscription;
private double? _value;
private double _value;
private string _text;
private bool _internalValueSet;
private bool _clipValueToMinMax;
@ -182,24 +171,6 @@ namespace Avalonia.Controls
set { SetAndRaise(CultureInfoProperty, ref _cultureInfo, value); }
}
/// <summary>
/// Gets or sets the value to use when the <see cref="Value"/> is null and an increment/decrement operation is performed.
/// </summary>
public double? DefaultValue
{
get { return GetValue(DefaultValueProperty); }
set { SetValue(DefaultValueProperty, value); }
}
/// <summary>
/// Gets or sets if the defaultValue should be displayed when the Text is empty.
/// </summary>
public bool DisplayDefaultValueOnEmptyText
{
get { return GetValue(DisplayDefaultValueOnEmptyTextProperty); }
set { SetValue(DisplayDefaultValueOnEmptyTextProperty, value); }
}
/// <summary>
/// Gets or sets the display format of the <see cref="Value"/>.
/// </summary>
@ -266,7 +237,7 @@ namespace Avalonia.Controls
/// <summary>
/// Gets or sets the value.
/// </summary>
public double? Value
public double Value
{
get { return _value; }
set
@ -307,8 +278,6 @@ namespace Avalonia.Controls
static NumericUpDown()
{
CultureInfoProperty.Changed.Subscribe(OnCultureInfoChanged);
DefaultValueProperty.Changed.Subscribe(OnDefaultValueChanged);
DisplayDefaultValueOnEmptyTextProperty.Changed.Subscribe(OnDisplayDefaultValueOnEmptyTextChanged);
FormatStringProperty.Changed.Subscribe(FormatStringChanged);
IncrementProperty.Changed.Subscribe(IncrementChanged);
IsReadOnlyProperty.Changed.Subscribe(OnIsReadOnlyChanged);
@ -374,32 +343,6 @@ namespace Avalonia.Controls
}
}
/// <summary>
/// Called when the <see cref="DefaultValue"/> property value changed.
/// </summary>
/// <param name="oldValue">The old value.</param>
/// <param name="newValue">The new value.</param>
protected virtual void OnDefaultValueChanged(double oldValue, double newValue)
{
if (IsInitialized && string.IsNullOrEmpty(Text))
{
SyncTextAndValueProperties(true, Text);
}
}
/// <summary>
/// Called when the <see cref="DisplayDefaultValueOnEmptyText"/> property value changed.
/// </summary>
/// <param name="oldValue">The old value.</param>
/// <param name="newValue">The new value.</param>
protected virtual void OnDisplayDefaultValueOnEmptyTextChanged(bool oldValue, bool newValue)
{
if (IsInitialized && string.IsNullOrEmpty(Text))
{
SyncTextAndValueProperties(false, Text);
}
}
/// <summary>
/// Called when the <see cref="FormatString"/> property value changed.
/// </summary>
@ -447,9 +390,9 @@ namespace Avalonia.Controls
{
SetValidSpinDirection();
}
if (Value.HasValue && ClipValueToMinMax)
if (ClipValueToMinMax)
{
Value = CoerceValueMinMax(Value.Value);
Value = MathUtilities.Clamp(Value, Minimum, Maximum);
}
}
@ -464,9 +407,9 @@ namespace Avalonia.Controls
{
SetValidSpinDirection();
}
if (Value.HasValue && ClipValueToMinMax)
if (ClipValueToMinMax)
{
Value = CoerceValueMinMax(Value.Value);
Value = MathUtilities.Clamp(Value, Minimum, Maximum);
}
}
@ -531,7 +474,7 @@ namespace Avalonia.Controls
/// Called when the <see cref="Value"/> property has to be coerced.
/// </summary>
/// <param name="baseValue">The value.</param>
protected virtual double? OnCoerceValue(double? baseValue)
protected virtual double OnCoerceValue(double baseValue)
{
return baseValue;
}
@ -574,9 +517,9 @@ namespace Avalonia.Controls
/// <summary>
/// Converts the formatted text to a value.
/// </summary>
private double? ConvertTextToValue(string text)
private double ConvertTextToValue(string text)
{
double? result = null;
double result = 0;
if (string.IsNullOrEmpty(text))
{
@ -595,10 +538,10 @@ namespace Avalonia.Controls
if (ClipValueToMinMax)
{
return GetClippedMinMaxValue(result);
return MathUtilities.Clamp(result, Minimum, Maximum);
}
ValidateDefaultMinMax(result);
ValidateMinMax(result);
return result;
}
@ -609,19 +552,13 @@ namespace Avalonia.Controls
/// <returns></returns>
private string ConvertValueToText()
{
if (Value == null)
{
return string.Empty;
}
//Manage FormatString of type "{}{0:N2} °" (in xaml) or "{0:N2} °" in code-behind.
if (FormatString.Contains("{0"))
{
return string.Format(CultureInfo, FormatString, Value.Value);
return string.Format(CultureInfo, FormatString, Value);
}
return Value.Value.ToString(FormatString, CultureInfo);
return Value.ToString(FormatString, CultureInfo);
}
/// <summary>
@ -629,11 +566,8 @@ namespace Avalonia.Controls
/// </summary>
private void OnIncrement()
{
if (!HandleNullSpin())
{
var result = Value.Value + Increment;
Value = CoerceValueMinMax(result);
}
var result = Value + Increment;
Value = MathUtilities.Clamp(result, Minimum, Maximum);
}
/// <summary>
@ -641,11 +575,8 @@ namespace Avalonia.Controls
/// </summary>
private void OnDecrement()
{
if (!HandleNullSpin())
{
var result = Value.Value - Increment;
Value = CoerceValueMinMax(result);
}
var result = Value - Increment;
Value = MathUtilities.Clamp(result, Minimum, Maximum);
}
/// <summary>
@ -658,12 +589,12 @@ namespace Avalonia.Controls
// Zero increment always prevents spin.
if (Increment != 0 && !IsReadOnly)
{
if (IsLowerThan(Value, Maximum) || !Value.HasValue)
if (Value < Maximum)
{
validDirections = validDirections | ValidSpinDirections.Increase;
}
if (IsGreaterThan(Value, Minimum) || !Value.HasValue)
if (Value > Minimum)
{
validDirections = validDirections | ValidSpinDirections.Decrease;
}
@ -689,34 +620,6 @@ namespace Avalonia.Controls
}
}
/// <summary>
/// Called when the <see cref="DefaultValue"/> property value changed.
/// </summary>
/// <param name="e">The event args.</param>
private static void OnDefaultValueChanged(AvaloniaPropertyChangedEventArgs e)
{
if (e.Sender is NumericUpDown upDown)
{
var oldValue = (double)e.OldValue;
var newValue = (double)e.NewValue;
upDown.OnDefaultValueChanged(oldValue, newValue);
}
}
/// <summary>
/// Called when the <see cref="DisplayDefaultValueOnEmptyText"/> property value changed.
/// </summary>
/// <param name="e">The event args.</param>
private static void OnDisplayDefaultValueOnEmptyTextChanged(AvaloniaPropertyChangedEventArgs e)
{
if (e.Sender is NumericUpDown upDown)
{
var oldValue = (bool) e.OldValue;
var newValue = (bool) e.NewValue;
upDown.OnDisplayDefaultValueOnEmptyTextChanged(oldValue, newValue);
}
}
/// <summary>
/// Called when the <see cref="Increment"/> property value changed.
/// </summary>
@ -815,7 +718,7 @@ namespace Avalonia.Controls
}
}
private void SetValueInternal(double? value)
private void SetValueInternal(double value)
{
_internalValueSet = true;
try
@ -947,12 +850,7 @@ namespace Avalonia.Controls
{
if (updateValueFromText)
{
if (string.IsNullOrEmpty(text))
{
// An empty input sets the value to the default value.
SetValueInternal(DefaultValue);
}
else
if (!string.IsNullOrEmpty(text))
{
try
{
@ -972,9 +870,8 @@ namespace Avalonia.Controls
// Do not touch the ongoing text input from user.
if (!_isTextChangedFromUI)
{
// Don't replace the empty Text with the non-empty representation of DefaultValue.
var shouldKeepEmpty = !forceTextUpdate && string.IsNullOrEmpty(Text) && Equals(Value, DefaultValue) && !DisplayDefaultValueOnEmptyText;
if (!shouldKeepEmpty)
var keepEmpty = !forceTextUpdate && string.IsNullOrEmpty(Text);
if (!keepEmpty)
{
var newText = ConvertValueToText();
if (!Equals(Text, newText))
@ -1011,54 +908,9 @@ namespace Avalonia.Controls
return parsedTextIsValid;
}
private double? CoerceValueMinMax(double? value)
{
if (IsLowerThan(value, Minimum))
{
return Minimum;
}
else if (IsGreaterThan(value, Maximum))
{
return Maximum;
}
else
{
return value;
}
}
private static bool IsLowerThan(double? value1, double? value2)
{
if (value1 == null || value2 == null)
{
return false;
}
return value1.Value < value2.Value;
}
private static bool IsGreaterThan(double? value1, double? value2)
{
if (value1 == null || value2 == null)
{
return false;
}
return value1.Value > value2.Value;
}
private bool HandleNullSpin()
{
if (!Value.HasValue)
{
var forcedValue = DefaultValue ?? default(double);
Value = CoerceValueMinMax(forcedValue);
return true;
}
return false;
}
private double? ConvertTextToValueCore(string currentValueText, string text)
private double ConvertTextToValueCore(string currentValueText, string text)
{
double? result;
double result;
if (IsPercent(FormatString))
{
@ -1102,32 +954,13 @@ namespace Avalonia.Controls
return result;
}
private double? GetClippedMinMaxValue(double? result)
private void ValidateMinMax(double value)
{
if (IsGreaterThan(result, Maximum))
{
return Maximum;
}
else if (IsLowerThan(result, Minimum))
{
return Minimum;
}
return result;
}
private void ValidateDefaultMinMax(double? value)
{
// DefaultValue is always accepted.
if (Equals(value, DefaultValue))
{
return;
}
if (IsLowerThan(value, Minimum))
if (value < Minimum)
{
throw new ArgumentOutOfRangeException(nameof(Minimum), string.Format("Value must be greater than Minimum value of {0}", Minimum));
}
else if (IsGreaterThan(value, Maximum))
else if (value > Maximum)
{
throw new ArgumentOutOfRangeException(nameof(Maximum), string.Format("Value must be less than Maximum value of {0}", Maximum));
}

Write Preview
Loading…
Cancel
Save