Align NumericUpDown style with other controls (#3615)

michaelmairegger · Keboo · web-flow · commit 41489ff91e26 · 2024-06-27T06:40:31.000Z
* Add NumericUpDown to FieldsLineUp

* Align NumericUpDown style to other controls

* Respect values for IncreaseContent and DecreaseContent

* Add NumericUpDown to Material2 FieldsLineUp

* Rename PART_TextBox

* Fixing obsolete message on assist classes.

* Updated NumericUpDown styles to not leverage obsolete attached properties.

* Fixing UI tests

---------

Co-authored-by: Kevin Bost &lt;kitokeboo@gmail.com&gt;
diff --git a/src/MainDemo.Wpf/Domain/MainWindowViewModel.cs b/src/MainDemo.Wpf/Domain/MainWindowViewModel.cs
@@ -191,7 +191,7 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         };
 
         yield return new DemoItem(
-            "Field line up",
+            "Fields line up",
             typeof(FieldsLineUp),
             new[]
             {
diff --git a/src/MainDemo.Wpf/FieldsLineUp.xaml b/src/MainDemo.Wpf/FieldsLineUp.xaml
@@ -19,8 +19,10 @@
 
     <GroupBox HorizontalAlignment="Left"
               VerticalAlignment="Top"
-              materialDesign:ColorZoneAssist.Background="{DynamicResource PrimaryHueLightBrush}"
-              materialDesign:ColorZoneAssist.Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
+              BorderBrush="{DynamicResource MaterialDesign.Brush.Primary}"
+              BorderThickness="1"
+              materialDesign:ColorZoneAssist.Background="{DynamicResource MaterialDesign.Brush.Background}"
+              materialDesign:ColorZoneAssist.Foreground="{DynamicResource MaterialDesign.Brush.Foreground}"
               materialDesign:ColorZoneAssist.Mode="Custom">
       <GroupBox.Header>
         <StackPanel Orientation="Horizontal">
@@ -81,7 +83,7 @@
               <Style TargetType="TextBox" BasedOn="{StaticResource MaterialDesignTextBox}">
                 <Setter Property="FontFamily" Value="Consolas" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="Margin" Value="10,2" />
+                <Setter Property="Margin" Value="10,6" />
                 <Setter Property="MinWidth" Value="200" />
                 <Setter Property="VerticalAlignment" Value="Center" />
                 <Setter Property="materialDesign:HintAssist.IsFloating" Value="True" />
@@ -156,6 +158,7 @@
             <ColumnDefinition MinWidth="100" />
             <ColumnDefinition MinWidth="100" />
             <ColumnDefinition MinWidth="100" />
+            <ColumnDefinition MinWidth="100" />
           </Grid.ColumnDefinitions>
 
           <TextBlock Grid.Row="1"
@@ -195,6 +198,10 @@
                      Grid.Column="5"
                      Style="{StaticResource FieldHeader}"
                      Text="TimePicker" />
+          <TextBlock Grid.Row="0"
+                     Grid.Column="6"
+                     Style="{StaticResource FieldHeader}"
+                     Text="NumericUpDown" />
 
           <TextBox Grid.Row="1" Grid.Column="1" />
           <TextBox Grid.Row="2"
@@ -251,6 +258,17 @@
                                      Grid.Column="5"
                                      Style="{StaticResource MaterialDesignOutlinedTimePicker}" />
 
+          <materialDesign:NumericUpDown Grid.Row="1" Grid.Column="6" />
+          <materialDesign:NumericUpDown Grid.Row="2"
+                                        Grid.Column="6"
+                                        Style="{StaticResource MaterialDesignFloatingHintNumericUpDown}" />
+          <materialDesign:NumericUpDown Grid.Row="3"
+                                        Grid.Column="6"
+                                        Style="{StaticResource MaterialDesignFilledNumericUpDown}" />
+          <materialDesign:NumericUpDown Grid.Row="4"
+                                        Grid.Column="6"
+                                        Style="{StaticResource MaterialDesignOutlinedNumericUpDown}" />
+
         </Grid>
       </StackPanel>
     </GroupBox>
diff --git a/src/MainDemo.Wpf/FieldsLineUp.xaml.cs b/src/MainDemo.Wpf/FieldsLineUp.xaml.cs
@@ -90,6 +90,9 @@ private static void SetValue(Control control)
             case TimePicker timePicker:
                 timePicker.SelectedTime = DateTime.Now;
                 break;
+            case MaterialDesignThemes.Wpf.NumericUpDown numericUpDown:
+                numericUpDown.Value = 0;
+                break;
             default:
                 throw new NotSupportedException(control.GetType().FullName);
         }
diff --git a/src/MaterialDesign3.Demo.Wpf/FieldsLineUp.xaml b/src/MaterialDesign3.Demo.Wpf/FieldsLineUp.xaml
@@ -147,6 +147,7 @@
           <ColumnDefinition MinWidth="100" />
           <ColumnDefinition MinWidth="100" />
           <ColumnDefinition MinWidth="100" />
+          <ColumnDefinition MinWidth="100" />
         </Grid.ColumnDefinitions>
 
         <TextBlock Grid.Row="1"
@@ -186,6 +187,10 @@
                    Grid.Column="5"
                    Style="{StaticResource FieldHeader}"
                    Text="TimePicker" />
+        <TextBlock Grid.Row="0"
+                   Grid.Column="6"
+                   Style="{StaticResource FieldHeader}"
+                   Text="NumericUpDown" />
 
         <TextBox Grid.Row="1" Grid.Column="1" />
         <TextBox Grid.Row="2"
@@ -242,6 +247,17 @@
                                    Grid.Column="5"
                                    Style="{StaticResource MaterialDesignOutlinedTimePicker}" />
 
+        <materialDesign:NumericUpDown Grid.Row="1" Grid.Column="6" />
+        <materialDesign:NumericUpDown Grid.Row="2"
+                                      Grid.Column="6"
+                                      Style="{StaticResource MaterialDesignFloatingHintNumericUpDown}" />
+        <materialDesign:NumericUpDown Grid.Row="3"
+                                      Grid.Column="6"
+                                      Style="{StaticResource MaterialDesignFilledNumericUpDown}" />
+        <materialDesign:NumericUpDown Grid.Row="4"
+                                      Grid.Column="6"
+                                      Style="{StaticResource MaterialDesignOutlinedNumericUpDown}" />
+
       </Grid>
     </StackPanel>
   </GroupBox>
diff --git a/src/MaterialDesign3.Demo.Wpf/FieldsLineUp.xaml.cs b/src/MaterialDesign3.Demo.Wpf/FieldsLineUp.xaml.cs
@@ -90,6 +90,9 @@ private static void SetValue(Control control)
             case TimePicker timePicker:
                 timePicker.SelectedTime = DateTime.Now;
                 break;
+            case NumericUpDown numericUpDown:
+                numericUpDown.Value = 0;
+                break;
             default:
                 throw new NotSupportedException(control.GetType().FullName);
         }
diff --git a/src/MaterialDesignThemes.Wpf/DatePickerAssist.cs b/src/MaterialDesignThemes.Wpf/DatePickerAssist.cs
@@ -1,6 +1,6 @@
 ﻿namespace MaterialDesignThemes.Wpf;
 
-[Obsolete("This class is obsolete and will be removed in a future version. Please use the TextBoxAssist equivalents instead. For OutlinedBorderInactiveThickness, simply use BorderThickness property instead.")]
+[Obsolete("This class is obsolete and will be removed in a future version. Please use the TextFieldAssist equivalents instead. For OutlinedBorderInactiveThickness, simply use DatePicker.BorderThickness property instead.")]
 public static class DatePickerAssist
 {
     public static readonly DependencyProperty OutlinedBorderInactiveThicknessProperty = DependencyProperty.RegisterAttached(
diff --git a/src/MaterialDesignThemes.Wpf/NumericUpDown.cs b/src/MaterialDesignThemes.Wpf/NumericUpDown.cs
@@ -1,17 +1,16 @@
 using System.ComponentModel;
 using System.Globalization;
-using System.Windows.Automation.Peers;
 
 namespace MaterialDesignThemes.Wpf;
 
 [TemplatePart(Name = IncreaseButtonPartName, Type = typeof(RepeatButton))]
 [TemplatePart(Name = DecreaseButtonPartName, Type = typeof(RepeatButton))]
-[TemplatePart(Name = TextFieldBoxPartName, Type = typeof(TextBox))]
+[TemplatePart(Name = TextBoxPartName, Type = typeof(TextBox))]
 public class NumericUpDown : Control
 {
     public const string IncreaseButtonPartName = "PART_IncreaseButton";
     public const string DecreaseButtonPartName = "PART_DecreaseButton";
-    public const string TextFieldBoxPartName = "PART_TextBoxField";
+    public const string TextBoxPartName = "PART_TextBox";
 
     private TextBox? _textBoxField;
     private RepeatButton? _decreaseButton;
@@ -180,7 +179,7 @@ public override void OnApplyTemplate()
 
         _increaseButton = GetTemplateChild(IncreaseButtonPartName) as RepeatButton;
         _decreaseButton = GetTemplateChild(DecreaseButtonPartName) as RepeatButton;
-        _textBoxField = GetTemplateChild(TextFieldBoxPartName) as TextBox;
+        _textBoxField = GetTemplateChild(TextBoxPartName) as TextBox;
 
         if (_increaseButton != null)
             _increaseButton.Click += IncreaseButtonOnClick;
diff --git a/src/MaterialDesignThemes.Wpf/Themes/Generic.xaml b/src/MaterialDesignThemes.Wpf/Themes/Generic.xaml
@@ -4,16 +4,15 @@
                     xmlns:local="clr-namespace:MaterialDesignThemes.Wpf"
                     xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
-                    xmlns:transitions="clr-namespace:MaterialDesignThemes.Wpf.Transitions"
-                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
+                    xmlns:transitions="clr-namespace:MaterialDesignThemes.Wpf.Transitions">
 
   <ResourceDictionary.MergedDictionaries>
     <!--
       we only bring in the dictionaries for controls which were "invented"
       as part of Material Design in XAML Toolkit. Other themes, for existing controls
       must be selected manually by the user, so that they override default styles.
       The easiest way to do this is include:
-      
+
       MaterialDesignTheme.Defaults.xaml
       in your App.xaml
     -->
@@ -43,6 +42,7 @@
   <Style TargetType="{x:Type local:TimePicker}" BasedOn="{StaticResource MaterialDesignTimePicker}" />
   <Style TargetType="{x:Type local:AutoSuggestBox}" BasedOn="{StaticResource MaterialDesignAutoSuggestBox}" />
   <Style TargetType="{x:Type local:SplitButton}" BasedOn="{StaticResource MaterialDesignRaisedSplitButton}" />
+  <Style TargetType="{x:Type local:NumericUpDown}" BasedOn="{StaticResource MaterialDesignNumericUpDown}" />
 
   <converters:BrushToRadialGradientBrushConverter x:Key="BrushToRadialGradientBrushConverter" />
   <converters:DrawerOffsetConverter x:Key="DrawerOffsetConverter" />
@@ -332,7 +332,7 @@
               <Setter TargetName="ComponentOneTwoWrapper" Property="Opacity" Value=".56" />
               <Setter TargetName="ComponentThreeTextBlock" Property="Opacity" Value="1" />
             </Trigger>
-            <Trigger Property="wpf:CalendarAssist.Orientation" Value="Horizontal">
+            <Trigger Property="local:CalendarAssist.Orientation" Value="Horizontal">
               <Setter TargetName="ComponentOneTwoWrapper" Property="Orientation" Value="Vertical" />
             </Trigger>
           </ControlTemplate.Triggers>
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml
@@ -23,6 +23,7 @@
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Listbox.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ListView.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Menu.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.NumericUpDown.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PasswordBox.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ProgressBar.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.RadioButton.xaml" />
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml
@@ -31,6 +31,7 @@
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Listbox.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ListView.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Menu.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.NumericUpDown.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PasswordBox.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ProgressBar.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.RadioButton.xaml" />
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.NumericUpDown.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.NumericUpDown.xaml
diff --git a/src/MaterialDesignThemes.Wpf/TimePickerAssist.cs b/src/MaterialDesignThemes.Wpf/TimePickerAssist.cs
diff --git a/tests/MaterialDesignThemes.UITests/WPF/NumericUpDowns/NumericUpDownTests.cs b/tests/MaterialDesignThemes.UITests/WPF/NumericUpDowns/NumericUpDownTests.cs

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna`
`191`	`191`	`};`
`192`	`192`
`193`	`193`	`yield return new DemoItem(`
`194`		`- "Field line up",`
	`194`	`+ "Fields line up",`
`195`	`195`	`typeof(FieldsLineUp),`
`196`	`196`	`new[]`
`197`	`197`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace MaterialDesignThemes.Wpf;`
`2`	`2`
`3`		`-[Obsolete("This class is obsolete and will be removed in a future version. Please use the TextBoxAssist equivalents instead. For OutlinedBorderInactiveThickness, simply use BorderThickness property instead.")]`
	`3`	`+[Obsolete("This class is obsolete and will be removed in a future version. Please use the TextFieldAssist equivalents instead. For OutlinedBorderInactiveThickness, simply use DatePicker.BorderThickness property instead.")]`
`4`	`4`	`public static class DatePickerAssist`
`5`	`5`	`{`
`6`	`6`	`public static readonly DependencyProperty OutlinedBorderInactiveThicknessProperty = DependencyProperty.RegisterAttached(`