Additional SmartHint refactoring (#3181)

* Initial work of respecting TextBox.Height - only done for TextBox so far

* Aligning prefix/suffix texts

* PasswordBox respects VerticalContentAlignment

Icons still need alignment

* Fixes hint floating position for default offset

* DatePicker now respects VerticalContentAlignment

* TimePicker now respects VerticalContentAlignment

* Renamed element to match content

* PasswordBox trailing icons/buttons now respect VerticalContentAlignment

* ComboBox clear button now respects VerticalContentAlignment

* ComboBox toggle button now respects VerticalContentAlignment

* Improved 'Smart Hint' demo app page

* Added FontSize to 'Smart Hint' demo app page

* Change default VerticalContentAlignment of ComboBox to Center

* Apply red color to FontSize in 'Smart Hint' demo page

Currently only the default FontSize is correctly supported.

* Use FontFamily from "hint" as input to floating offset converter

* Add support for controlling FontFamily in 'Smart Hint' demo page

* Add comment in demo app page regarding ShowMeTheXaml

* Fix typo

* Fix for broken UI tests for DatePicker and TimePicker

* Fix broken UI tests for PasswordBox

* Apply same visibility fix for TextBox as was done to PasswordBox, etc.

The TextBox also uses the "IsHintInFloatingPosition" AP for the prefix text. I did not touch this as it still collapses it when the prefix text is not set.

* Align ComboBox prefix/suffix text margin and visibility with other ctrls

* Use HelperTextStyle in ComboBox, DatePicker, and TimePicker

Also uses the helper text in the 'Smart Hint' demo app for a warning

* Set default VerticalContentAlignment=Center for Date- and TimePicker

Fixes failing UI test

* Fixed failing unit tests for FloatingHintTransformConverter

Author: nicolaihenriksen

MainDemo.Wpf/Domain/SmartHintViewModel.cs

@@ -1,25 +1,43 @@
-using MaterialDesignThemes.Wpf;
+using System.Windows.Media;
+using MaterialDesignThemes.Wpf;
 
 namespace MaterialDesignDemo.Domain;
 
 internal class SmartHintViewModel : ViewModelBase
 {
+    public static Point DefaultFloatingOffset { get; } = new(0, -16);
+    public static FontFamily DefaultFontFamily = (FontFamily)new MaterialDesignFontExtension().ProvideValue(null!);
+
     private bool _floatHint = true;
     private FloatingHintHorizontalAlignment _selectedAlignment = FloatingHintHorizontalAlignment.Inherit;
     private double _selectedFloatingScale = 0.75;
     private bool _showClearButton = true;
     private bool _showLeadingIcon = true;
+    private bool _showTrailingIcon = true;
     private string _hintText = "Hint text";
     private string _helperText = "Helper text";
-    private Point _selectedFloatingOffset = new(0, -16);
+    private Point _selectedFloatingOffset = DefaultFloatingOffset;
     private bool _applyCustomPadding;
     private Thickness _selectedCustomPadding = new(5);
+    private double _selectedCustomHeight = double.NaN;
+    private VerticalAlignment _selectedVerticalAlignment = VerticalAlignment.Center;
+    private double _selectedLeadingIconSize = 20;
+    private double _selectedTrailingIconSize = 20;
+    private string? _prefixText;
+    private string? _suffixText;
+    private double _selectedFontSize = double.NaN;
+    private FontFamily? _selectedFontFamily = DefaultFontFamily;
 
     public IEnumerable<FloatingHintHorizontalAlignment> HorizontalAlignmentOptions { get; } = Enum.GetValues(typeof(FloatingHintHorizontalAlignment)).OfType<FloatingHintHorizontalAlignment>();
     public IEnumerable<double> FloatingScaleOptions { get; } = new[] {0.25, 0.5, 0.75, 1.0};
-    public IEnumerable<Point> FloatingOffsetOptions { get; } = new[] { new Point(0, -16), new Point(0, 16), new Point(16, 16), new Point(-16, -16) };
+    public IEnumerable<Point> FloatingOffsetOptions { get; } = new[] { DefaultFloatingOffset, new Point(0, -25), new Point(16, -16), new Point(-16, -16), new Point(0, -50) };
     public IEnumerable<string> ComboBoxOptions { get; } = new[] {"Option 1", "Option 2", "Option 3"};
     public IEnumerable<Thickness> CustomPaddingOptions { get; } = new [] { new Thickness(0), new Thickness(5), new Thickness(10), new Thickness(15) };
+    public IEnumerable<double> CustomHeightOptions { get; } = new[] { double.NaN, 50, 75, 100 };
+    public IEnumerable<VerticalAlignment> VerticalAlignmentOptions { get; } = (VerticalAlignment[])Enum.GetValues(typeof(VerticalAlignment));
+    public IEnumerable<double> IconSizeOptions { get; } = new[] { 10.0, 15, 20, 30, 50, 75 };
+    public IEnumerable<double> FontSizeOptions { get; } = new[] { double.NaN, 8, 12, 16, 20, 24, 28 };
+    public IEnumerable<FontFamily> FontFamilyOptions { get; } = new FontFamily[] { DefaultFontFamily }.Concat(Fonts.SystemFontFamilies.OrderBy(f => f.Source));
 
     public bool FloatHint
     {
@@ -81,6 +99,16 @@ public bool ShowLeadingIcon
         }
     }
 
+    public bool ShowTrailingIcon
+    {
+        get => _showTrailingIcon;
+        set
+        {
+            _showTrailingIcon = value;
+            OnPropertyChanged();
+        }
+    }
+
     public string HintText
     {
         get => _hintText;
@@ -120,4 +148,84 @@ public Thickness SelectedCustomPadding
             OnPropertyChanged();
         }
     }
+
+    public double SelectedCustomHeight
+    {
+        get => _selectedCustomHeight;
+        set
+        {
+            _selectedCustomHeight = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public VerticalAlignment SelectedVerticalAlignment
+    {
+        get => _selectedVerticalAlignment;
+        set
+        {
+            _selectedVerticalAlignment = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public double SelectedLeadingIconSize
+    {
+        get => _selectedLeadingIconSize;
+        set
+        {
+            _selectedLeadingIconSize = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public double SelectedTrailingIconSize
+    {
+        get => _selectedTrailingIconSize;
+        set
+        {
+            _selectedTrailingIconSize = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public string? PrefixText
+    {
+        get => _prefixText;
+        set
+        {
+            _prefixText = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public string? SuffixText
+    {
+        get => _suffixText;
+        set
+        {
+            _suffixText = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public double SelectedFontSize
+    {
+        get => _selectedFontSize;
+        set
+        {
+            _selectedFontSize = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public FontFamily? SelectedFontFamily
+    {
+        get => _selectedFontFamily;
+        set
+        {
+            _selectedFontFamily = value;
+            OnPropertyChanged();
+        }
+    }
 }

MainDemo.Wpf/MainWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
         Title="Material Design in XAML"
-        Width="1100"
+        Width="1150"
         MaxHeight="{Binding Source={x:Static SystemParameters.MaximizedPrimaryScreenHeight}}"
         d:DataContext="{d:DesignInstance domain:MainWindowViewModel}"
         AutomationProperties.Name="{Binding Title, RelativeSource={RelativeSource Self}}"