From 3ea1b2e9fa23f39202ad5b37ee4f31a475c8b68b Mon Sep 17 00:00:00 2001
From: kronic <kronic2006@gmail.com>
Date: Wed, 10 Apr 2024 09:35:17 +0300
Subject: [PATCH] Fix NumericUpDown DataValidationErrors (#15134)

---
 .../Controls/NumericUpDown.xaml               | 84 +++++++++++--------
 .../Controls/NumericUpDown.xaml               | 60 ++++++-------
 2 files changed, 77 insertions(+), 67 deletions(-)

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