Fix(Fluent): TextBox invalidation style (#10887)

* Fix TextBox invalidation style

* Update Common theme files

* Update resource name

Author: harshit7962

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Variables.xaml

@@ -44,6 +44,7 @@
     <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
     <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
     <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
+    <Thickness x:Key="TextControlErrorBorderPadding">1</Thickness>
 
     <system:Double x:Key="ComboBoxMinHeight">24</system:Double>
     <!-- <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness> -->

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/TextBox.xaml

@@ -233,8 +233,19 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
+    <ControlTemplate x:Key="DefaultTextBoxInvalidationStyle">
+        <Border
+            BorderBrush="{DynamicResource SystemFillColorCriticalBrush}"
+            BorderThickness="{DynamicResource TextControlBorderThemeThickness}"
+            CornerRadius="{DynamicResource ControlCornerRadius}"
+            Padding="{StaticResource TextControlErrorBorderPadding}">
+            <AdornedElementPlaceholder />
+        </Border>
+    </ControlTemplate>
+
     <Style x:Key="DefaultTextBoxStyle" TargetType="{x:Type TextBox}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource DefaultTextBoxInvalidationStyle}" />
         <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
         <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
         <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml

@@ -78,6 +78,7 @@
   <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
   <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
   <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
+  <Thickness x:Key="TextControlErrorBorderPadding">1</Thickness>
   <system:Double x:Key="ComboBoxMinHeight">24</system:Double>
   <!-- <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness> -->
   <system:Double x:Key="NavigationViewItemOnLeftMinHeight">32</system:Double>
@@ -4959,8 +4960,14 @@
       </Trigger>
     </ControlTemplate.Triggers>
   </ControlTemplate>
+  <ControlTemplate x:Key="DefaultTextBoxInvalidationStyle">
+    <Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource TextControlErrorBorderPadding}">
+      <AdornedElementPlaceholder />
+    </Border>
+  </ControlTemplate>
   <Style x:Key="DefaultTextBoxStyle" TargetType="{x:Type TextBox}">
     <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource DefaultTextBoxInvalidationStyle}" />
     <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml

@@ -78,6 +78,7 @@
   <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
   <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
   <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
+  <Thickness x:Key="TextControlErrorBorderPadding">1</Thickness>
   <system:Double x:Key="ComboBoxMinHeight">24</system:Double>
   <!-- <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness> -->
   <system:Double x:Key="NavigationViewItemOnLeftMinHeight">32</system:Double>
@@ -4872,8 +4873,14 @@
       </Trigger>
     </ControlTemplate.Triggers>
   </ControlTemplate>
+  <ControlTemplate x:Key="DefaultTextBoxInvalidationStyle">
+    <Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource TextControlErrorBorderPadding}">
+      <AdornedElementPlaceholder />
+    </Border>
+  </ControlTemplate>
   <Style x:Key="DefaultTextBoxStyle" TargetType="{x:Type TextBox}">
     <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource DefaultTextBoxInvalidationStyle}" />
     <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml

@@ -78,6 +78,7 @@
   <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
   <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
   <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
+  <Thickness x:Key="TextControlErrorBorderPadding">1</Thickness>
   <system:Double x:Key="ComboBoxMinHeight">24</system:Double>
   <!-- <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness> -->
   <system:Double x:Key="NavigationViewItemOnLeftMinHeight">32</system:Double>
@@ -4968,8 +4969,14 @@
       </Trigger>
     </ControlTemplate.Triggers>
   </ControlTemplate>
+  <ControlTemplate x:Key="DefaultTextBoxInvalidationStyle">
+    <Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource TextControlErrorBorderPadding}">
+      <AdornedElementPlaceholder />
+    </Border>
+  </ControlTemplate>
   <Style x:Key="DefaultTextBoxStyle" TargetType="{x:Type TextBox}">
     <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource DefaultTextBoxInvalidationStyle}" />
     <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.xaml

@@ -78,6 +78,7 @@
   <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
   <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
   <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
+  <Thickness x:Key="TextControlErrorBorderPadding">1</Thickness>
   <system:Double x:Key="ComboBoxMinHeight">24</system:Double>
   <!-- <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness> -->
   <system:Double x:Key="NavigationViewItemOnLeftMinHeight">32</system:Double>
@@ -4218,8 +4219,14 @@
       </Trigger>
     </ControlTemplate.Triggers>
   </ControlTemplate>
+  <ControlTemplate x:Key="DefaultTextBoxInvalidationStyle">
+    <Border BorderBrush="{DynamicResource SystemFillColorCriticalBrush}" BorderThickness="{DynamicResource TextControlBorderThemeThickness}" CornerRadius="{DynamicResource ControlCornerRadius}" Padding="{StaticResource TextControlErrorBorderPadding}">
+      <AdornedElementPlaceholder />
+    </Border>
+  </ControlTemplate>
   <Style x:Key="DefaultTextBoxStyle" TargetType="{x:Type TextBox}">
     <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource DefaultTextBoxInvalidationStyle}" />
     <Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
     <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
     <Setter Property="CaretBrush" Value="{DynamicResource TextControlForeground}" />