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

6 years ago · cc712b6e0f
2 changed files with 3 additions and 5 deletions
--- a/src/Avalonia.Themes.Fluent/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Fluent/DataValidationErrors.xaml
@ -14,7 +14,7 @@
  <Setter Property="Template">
    <ControlTemplate>
      <DockPanel LastChildFill="True">
-        <ContentControl
+        <ContentControl Margin="0 4 0 0"
          DockPanel.Dock="Bottom"
          ContentTemplate="{TemplateBinding ErrorTemplate}"
          DataContext="{TemplateBinding Owner}"
--- a/src/Avalonia.Themes.Fluent/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/TextBox.xaml
@ -36,9 +36,7 @@
    <Setter Property="ContextMenu" Value="{StaticResource DefaultTextBoxContextMenu}" />
    <Setter Property="Template">
      <ControlTemplate>
-        <DockPanel>
-          <DataValidationErrors DockPanel.Dock="Bottom" Margin="0 10 0 0" />
-          
+        <DataValidationErrors>
          <Panel>
            <Border
              Name="PART_BorderElement"
@ -93,7 +91,7 @@
              </Grid>
            </Border>
          </Panel>
-        </DockPanel>
+        </DataValidationErrors>
      </ControlTemplate>
    </Setter>
  </Style>