format and fix step

This commit is contained in:
heartacker
2024-03-20 20:28:41 +08:00
parent 21e6a2e996
commit 09f345092d
2 changed files with 9 additions and 7 deletions

View File

@@ -35,22 +35,24 @@
MinWidth="0" MinWidth="0"
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
AllowSpin="{TemplateBinding AllowSpin}" AllowSpin="{TemplateBinding AllowSpin}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"> BorderThickness="{TemplateBinding BorderThickness}"
ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
<Panel> <Panel>
<TextBox <TextBox
Name="PART_TextBox" Name="PART_TextBox"
Height="{TemplateBinding Height}" Height="{TemplateBinding Height}"
MinHeight="{DynamicResource NumericUpDownWrapperDefaultHeight}" MinHeight="{DynamicResource NumericUpDownWrapperDefaultHeight}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
AcceptsReturn="False" AcceptsReturn="False"
Background="Transparent"
CornerRadius="{TemplateBinding CornerRadius}" CornerRadius="{TemplateBinding CornerRadius}"
DataValidationErrors.Errors="{ReflectionBinding $parent[NumericUpDown].(DataValidationErrors.Errors)}" DataValidationErrors.Errors="{ReflectionBinding $parent[NumericUpDown].(DataValidationErrors.Errors)}"
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" InnerLeftContent="{TemplateBinding InnerLeftContent}"
IsReadOnly="{TemplateBinding IsReadOnly}" IsReadOnly="{TemplateBinding IsReadOnly}"
TextWrapping="NoWrap" TextWrapping="NoWrap"
InnerLeftContent="{TemplateBinding InnerLeftContent}" InnerLeftContent="{TemplateBinding InnerLeftContent}"
@@ -65,11 +67,11 @@
IsVisible="{TemplateBinding AllowDrag}" /> IsVisible="{TemplateBinding AllowDrag}" />
<Button <Button
Name="PART_ClearButton" Name="PART_ClearButton"
Command="{Binding $parent[u:NumericUpDown].Clear}" Margin="0,0,8,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Margin="0 0 8 0" Command="{Binding $parent[u:NumericUpDown].Clear}"
IsVisible="False"
Focusable="False" Focusable="False"
IsVisible="False"
Theme="{StaticResource InputClearButton}" /> Theme="{StaticResource InputClearButton}" />
</Panel> </Panel>
</ButtonSpinner> </ButtonSpinner>

View File

@@ -38,7 +38,7 @@ public class NumericUIntUpDown : NumericUpDownBase<uint>
{ {
MaximumProperty.OverrideDefaultValue<NumericUIntUpDown>(uint.MaxValue); MaximumProperty.OverrideDefaultValue<NumericUIntUpDown>(uint.MaxValue);
MinimumProperty.OverrideDefaultValue<NumericUIntUpDown>(uint.MinValue); MinimumProperty.OverrideDefaultValue<NumericUIntUpDown>(uint.MinValue);
StepProperty.OverrideDefaultValue<NumericUIntUpDown>(0); StepProperty.OverrideDefaultValue<NumericUIntUpDown>(1);
} }
protected override bool ParseText(string? text, out uint number) protected override bool ParseText(string? text, out uint number)