Browse Source

feat(NumericUpDown): TextAlignment

pull/12368/head
Giuseppe Lippolis 3 years ago
parent
commit
55c9da56eb
  1. 15
      src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
  2. 1
      src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
  3. 1
      src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml

15
src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs

@ -126,6 +126,12 @@ namespace Avalonia.Controls
public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty = public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
ContentControl.VerticalContentAlignmentProperty.AddOwner<NumericUpDown>(); ContentControl.VerticalContentAlignmentProperty.AddOwner<NumericUpDown>();
/// <summary>
/// Defines the <see cref="TextAlignment"/> property
/// </summary>
public static readonly StyledProperty<Media.TextAlignment> TextAlignmentProperty =
TextBox.TextAlignmentProperty.AddOwner<NumericUpDown>();
private IDisposable? _textBoxTextChangedSubscription; private IDisposable? _textBoxTextChangedSubscription;
private bool _internalValueSet; private bool _internalValueSet;
@ -299,6 +305,15 @@ namespace Avalonia.Controls
set => SetValue(VerticalContentAlignmentProperty, value); set => SetValue(VerticalContentAlignmentProperty, value);
} }
/// <summary>
/// Gets or sets the <see cref="Media.TextAlignment"/> of the <see cref="NumericUpDown"/>
/// </summary>
public Media.TextAlignment TextAlignment
{
get => GetValue(TextAlignmentProperty);
set => SetValue(TextAlignmentProperty, value);
}
/// <summary> /// <summary>
/// Initializes new instance of <see cref="NumericUpDown"/> class. /// Initializes new instance of <see cref="NumericUpDown"/> class.
/// </summary> /// </summary>

1
src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml

@ -57,6 +57,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Text="{TemplateBinding Text}" Text="{TemplateBinding Text}"
TextAlignment="{TemplateBinding TextAlignment}"
AcceptsReturn="False" AcceptsReturn="False"
TextWrapping="NoWrap" /> TextWrapping="NoWrap" />
</ButtonSpinner> </ButtonSpinner>

1
src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml

@ -31,6 +31,7 @@
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
IsReadOnly="{TemplateBinding IsReadOnly}" IsReadOnly="{TemplateBinding IsReadOnly}"
Text="{TemplateBinding Text}" Text="{TemplateBinding Text}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="NoWrap" TextWrapping="NoWrap"
Watermark="{TemplateBinding Watermark}" /> Watermark="{TemplateBinding Watermark}" />
</ButtonSpinner> </ButtonSpinner>

Loading…
Cancel
Save