chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: support inner left content, fix formatting bug.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml
View File

@@ -14,7 +14,7 @@
</Style> </Style>
</UserControl.Styles> </UserControl.Styles>
<StackPanel HorizontalAlignment="Left"> <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> <TextBlock Text="{Binding #input.Value}" ></TextBlock>
<u:NumericDoubleUpDown Name="inputDouble" Step="0.5" Value="3.1" EmptyInputValue="1"></u:NumericDoubleUpDown> <u:NumericDoubleUpDown Name="inputDouble" Step="0.5" Value="3.1" EmptyInputValue="1"></u:NumericDoubleUpDown>
<TextBlock Text="{Binding #inputDouble.Value}"></TextBlock> <TextBlock Text="{Binding #inputDouble.Value}"></TextBlock>

1
src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml
View File

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

3
src/Ursa/Controls/NumericUpDown/IntUpDown.cs
View File

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

2
src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
View File

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