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

wrap control in datavalidation errors so it can be applied consistently.

pull/4964/head
Dan Walmsley 6 years ago
parent
78e2e2ef93
commit
cc712b6e0f
2 changed files with 3 additions and 5 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. 2
      src/Avalonia.Themes.Fluent/DataValidationErrors.xaml
  2. 6
      src/Avalonia.Themes.Fluent/TextBox.xaml

2
src/Avalonia.Themes.Fluent/DataValidationErrors.xaml
View File

@ -14,7 +14,7 @@
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<DockPanel LastChildFill="True"> <DockPanel LastChildFill="True">
<ContentControl <ContentControl Margin="0 4 0 0"
DockPanel.Dock="Bottom" DockPanel.Dock="Bottom"
ContentTemplate="{TemplateBinding ErrorTemplate}" ContentTemplate="{TemplateBinding ErrorTemplate}"
DataContext="{TemplateBinding Owner}" DataContext="{TemplateBinding Owner}"

6
src/Avalonia.Themes.Fluent/TextBox.xaml
View File

@ -36,9 +36,7 @@
<Setter Property="ContextMenu" Value="{StaticResource DefaultTextBoxContextMenu}" /> <Setter Property="ContextMenu" Value="{StaticResource DefaultTextBoxContextMenu}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<DockPanel> <DataValidationErrors>
<DataValidationErrors DockPanel.Dock="Bottom" Margin="0 10 0 0" />
<Panel> <Panel>
<Border <Border
Name="PART_BorderElement" Name="PART_BorderElement"
@ -93,7 +91,7 @@
</Grid> </Grid>
</Border> </Border>
</Panel> </Panel>
</DockPanel> </DataValidationErrors>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</Style> </Style>

Write Preview
Loading…
Cancel
Save