feat: support inner left content, fix formatting bug.

This commit is contained in:
rabbitism
2024-01-15 00:36:07 +08:00
parent 8230c8ec24
commit f895ea6a89
4 changed files with 4 additions and 4 deletions

View File

@@ -14,7 +14,7 @@
</Style>
</UserControl.Styles>
<StackPanel HorizontalAlignment="Left">
<u:NumericIntUpDown Name="input" Step="1" Value="2" Watermark="Input Value" Classes="ClearButton" />
<u:NumericIntUpDown Name="input" InnerLeftContent="Age" Step="1" Value="2" Watermark="Input Value" Classes="ClearButton" />
<TextBlock Text="{Binding #input.Value}" ></TextBlock>
<u:NumericDoubleUpDown Name="inputDouble" Step="0.5" Value="3.1" EmptyInputValue="1"></u:NumericDoubleUpDown>
<TextBlock Text="{Binding #inputDouble.Value}"></TextBlock>

View File

@@ -51,6 +51,7 @@
Foreground="{TemplateBinding Foreground}"
IsReadOnly="{TemplateBinding IsReadOnly}"
TextWrapping="NoWrap"
InnerLeftContent="{TemplateBinding InnerLeftContent}"
Theme="{DynamicResource NonErrorTextBox}"
Watermark="{TemplateBinding Watermark}" />
<Panel

View File

@@ -44,8 +44,7 @@ public class NumericDoubleUpDown : NumericUpDownBase<double>
protected override bool ParseText(string? text, out double? number)
{
// Weird bug
var result = double.TryParse(text, out var value);
var result = double.TryParse(text, ParsingNumberStyle, NumberFormat, out var value);
number = value;
return result;
}

View File

@@ -82,7 +82,7 @@ public abstract class NumericUpDown : TemplatedControl
}
public static readonly StyledProperty<NumberStyles> ParsingNumberStyleProperty = AvaloniaProperty.Register<NumericUpDown, NumberStyles>(
nameof(ParsingNumberStyle));
nameof(ParsingNumberStyle), defaultValue: NumberStyles.Any);
public NumberStyles ParsingNumberStyle
{