tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix NumericUpDown DataValidationErrors (#15134)

pull/15318/head
kronic 3 years ago
committed by GitHub
parent
3cecae943a
commit
3ea1b2e9fa
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 77 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
  2. 60
      src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml

84
src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
View File

@ -1,5 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" <ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=System.Runtime"
x:ClassModifier="internal"> x:ClassModifier="internal">
<Design.PreviewWith> <Design.PreviewWith>
<Border Padding="20"> <Border Padding="20">
@ -18,8 +19,8 @@
<NumericUpDown ButtonSpinnerLocation="Left"> <NumericUpDown ButtonSpinnerLocation="Left">
<NumericUpDown.InnerLeftContent> <NumericUpDown.InnerLeftContent>
<TextBlock Text="m" <TextBlock Text="m"
TextAlignment="Center" TextAlignment="Center"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
</NumericUpDown.InnerLeftContent> </NumericUpDown.InnerLeftContent>
<NumericUpDown.InnerRightContent> <NumericUpDown.InnerRightContent>
<Button Content="X"/> <Button Content="X"/>
@ -31,10 +32,19 @@
</NumericUpDown.InnerLeftContent> </NumericUpDown.InnerLeftContent>
<NumericUpDown.InnerRightContent> <NumericUpDown.InnerRightContent>
<TextBlock Text="m" <TextBlock Text="m"
TextAlignment="Center" TextAlignment="Center"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
</NumericUpDown.InnerRightContent> </NumericUpDown.InnerRightContent>
</NumericUpDown> </NumericUpDown>
<NumericUpDown>
<DataValidationErrors.Error>
<sys:Exception>
<x:Arguments>
<x:String>Error</x:String>
</x:Arguments>
</sys:Exception>
</DataValidationErrors.Error>
</NumericUpDown>
</StackPanel> </StackPanel>
</Border> </Border>
</Design.PreviewWith> </Design.PreviewWith>
@ -50,39 +60,39 @@
<Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<ButtonSpinner Name="PART_Spinner" <DataValidationErrors>
Background="{TemplateBinding Background}" <ButtonSpinner Name="PART_Spinner"
BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}"
IsTabStop="False" CornerRadius="{TemplateBinding CornerRadius}"
Padding="0" IsTabStop="False"
MinWidth="0" Padding="0"
HorizontalContentAlignment="Stretch" MinWidth="0"
VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
AllowSpin="{TemplateBinding AllowSpin}" VerticalContentAlignment="Stretch"
ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}" AllowSpin="{TemplateBinding AllowSpin}"
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"> ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
<TextBox Name="PART_TextBox" <TextBox Name="PART_TextBox"
Background="Transparent" Background="Transparent"
BorderBrush="Transparent" BorderBrush="Transparent"
Margin="-1" Margin="-1"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
MinWidth="0" MinWidth="0"
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
Watermark="{TemplateBinding Watermark}" Watermark="{TemplateBinding Watermark}"
IsReadOnly="{TemplateBinding IsReadOnly}" IsReadOnly="{TemplateBinding IsReadOnly}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Text="{TemplateBinding Text}" Text="{TemplateBinding Text}"
TextAlignment="{TemplateBinding TextAlignment}" TextAlignment="{TemplateBinding TextAlignment}"
AcceptsReturn="False" AcceptsReturn="False"
TextWrapping="NoWrap" TextWrapping="NoWrap"
InnerLeftContent="{Binding InnerLeftContent, RelativeSource={RelativeSource TemplatedParent}}" InnerLeftContent="{Binding InnerLeftContent, RelativeSource={RelativeSource TemplatedParent}}"
InnerRightContent="{Binding InnerRightContent, RelativeSource={RelativeSource TemplatedParent}}" InnerRightContent="{Binding InnerRightContent, RelativeSource={RelativeSource TemplatedParent}}"/>
/> </ButtonSpinner>
</ButtonSpinner> </DataValidationErrors>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>

60
src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml
View File

@ -9,36 +9,36 @@
<Setter Property="Padding" Value="4" /> <Setter Property="Padding" Value="4" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<ButtonSpinner Name="PART_Spinner" <DataValidationErrors>
HorizontalContentAlignment="Stretch" <ButtonSpinner Name="PART_Spinner"
VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
IsTabStop="False" VerticalContentAlignment="Stretch"
AllowSpin="{TemplateBinding AllowSpin}" IsTabStop="False"
Background="{TemplateBinding Background}" AllowSpin="{TemplateBinding AllowSpin}"
BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}"
BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}"
ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}" ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"> CornerRadius="{TemplateBinding CornerRadius}"
<TextBox Name="PART_TextBox" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
MinWidth="20" <TextBox Name="PART_TextBox"
Margin="4" MinWidth="20"
Padding="{TemplateBinding Padding}" Margin="4"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
AcceptsReturn="False" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Background="{TemplateBinding Background}" AcceptsReturn="False"
BorderThickness="0" Background="{TemplateBinding Background}"
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" BorderThickness="0"
IsReadOnly="{TemplateBinding IsReadOnly}" IsReadOnly="{TemplateBinding IsReadOnly}"
Text="{TemplateBinding Text}" Text="{TemplateBinding Text}"
TextAlignment="{TemplateBinding TextAlignment}" TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="NoWrap" TextWrapping="NoWrap"
Watermark="{TemplateBinding Watermark}" Watermark="{TemplateBinding Watermark}"
InnerLeftContent="{Binding InnerLeftContent, RelativeSource={RelativeSource TemplatedParent}}" InnerLeftContent="{Binding InnerLeftContent, RelativeSource={RelativeSource TemplatedParent}}"
InnerRightContent="{Binding InnerRightContent, RelativeSource={RelativeSource TemplatedParent}}" InnerRightContent="{Binding InnerRightContent, RelativeSource={RelativeSource TemplatedParent}}"/>
/> </ButtonSpinner>
</ButtonSpinner> </DataValidationErrors>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>

Write Preview
Loading…
Cancel
Save