From cc712b6e0f8e3eab9e275f036a838fdf6dab6715 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 28 Oct 2020 20:49:30 +0000
Subject: [PATCH] wrap control in datavalidation errors so it can be applied
 consistently.

---
 src/Avalonia.Themes.Fluent/DataValidationErrors.xaml | 2 +-
 src/Avalonia.Themes.Fluent/TextBox.xaml              | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/DataValidationErrors.xaml
index 1161a92e30..ed31f7b573 100644
--- 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}"
diff --git a/src/Avalonia.Themes.Fluent/TextBox.xaml b/src/Avalonia.Themes.Fluent/TextBox.xaml
index 2303c438fc..139a61abdf 100644
--- 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>