diff --git a/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml b/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml index f13dadd..afe4496 100644 --- a/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml +++ b/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml @@ -14,7 +14,7 @@ - + diff --git a/src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml b/src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml index 3c87f03..31c1aa8 100644 --- a/src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml +++ b/src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml @@ -51,6 +51,7 @@ Foreground="{TemplateBinding Foreground}" IsReadOnly="{TemplateBinding IsReadOnly}" TextWrapping="NoWrap" + InnerLeftContent="{TemplateBinding InnerLeftContent}" Theme="{DynamicResource NonErrorTextBox}" Watermark="{TemplateBinding Watermark}" /> 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; } diff --git a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs index 5c4dd72..44811ac 100644 --- a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs +++ b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs @@ -82,7 +82,7 @@ public abstract class NumericUpDown : TemplatedControl } public static readonly StyledProperty ParsingNumberStyleProperty = AvaloniaProperty.Register( - nameof(ParsingNumberStyle)); + nameof(ParsingNumberStyle), defaultValue: NumberStyles.Any); public NumberStyles ParsingNumberStyle {