TextField TrailingIcon added (built upon #2221 and previous) (#2222)

* TextField.PrefixText spec update

* WIP: TextField Leading Icon

* LeadingIconSize added, TextBox template changed for icon

* TextBox TrailingIcon added

* Fixing comments to match members

Co-authored-by: Kevin Bost <[email protected]>

Author: MichelMichels

MaterialDesignThemes.Wpf/TextFieldAssist.cs

@@ -216,6 +216,42 @@ public static void SetLeadingIconSize(DependencyObject element, double value)
         public static double GetLeadingIconSize(DependencyObject element)
             => (double)element.GetValue(LeadingIconSizeProperty);
 
+        /// <summary>
+        /// Controls visibility of the trailing icon
+        /// </summary>
+        public static readonly DependencyProperty HasTrailingIconProperty = DependencyProperty.RegisterAttached(
+            "HasTrailingIcon", typeof(bool), typeof(TextFieldAssist), new PropertyMetadata(default(bool)));
+
+        public static void SetHasTrailingIcon(DependencyObject element, bool value)
+            => element.SetValue(HasTrailingIconProperty, value);
+
+        public static bool GetHasTrailingIcon(DependencyObject element)
+            => (bool)element.GetValue(HasTrailingIconProperty);
+
+        /// <summary>
+        /// Controls the trailing icon
+        /// </summary>
+        public static readonly DependencyProperty TrailingIconProperty = DependencyProperty.RegisterAttached(
+            "TrailingIcon", typeof(PackIconKind), typeof(TextFieldAssist), new PropertyMetadata());
+
+        public static void SetTrailingIcon(DependencyObject element, PackIconKind value)
+            => element.SetValue(TrailingIconProperty, value);
+
+        public static PackIconKind GetTrailingIcon(DependencyObject element)
+            => (PackIconKind)element.GetValue(TrailingIconProperty);
+
+        /// <summary>
+        /// Controls the size of the trailing icon
+        /// </summary>
+        public static readonly DependencyProperty TrailingIconSizeProperty = DependencyProperty.RegisterAttached(
+            "TrailingIconSize", typeof(double), typeof(TextFieldAssist), new PropertyMetadata(20.0));
+
+        public static void SetTrailingIconSize(DependencyObject element, double value)
+            => element.SetValue(TrailingIconSizeProperty, value);
+
+        public static double GetTrailingIconSize(DependencyObject element)
+            => (double)element.GetValue(TrailingIconSizeProperty);
+
         #region Methods
 
         private static void IncludeSpellingSuggestionsChanged(DependencyObject element, DependencyPropertyChangedEventArgs e)

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

@@ -98,10 +98,10 @@
                                     <wpf:PackIcon
                                         Grid.Column="0"
                                         x:Name="LeadingPackIcon"
-                                        Margin="0 0 8 0"
+                                        Margin="0 0 6 0"
+                                        VerticalAlignment="Center"
                                         Height="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
                                         Width="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
-                                        VerticalAlignment="Bottom"
                                         Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
                                         Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={StaticResource BooleanToVisibilityConverter}}"
                                         Kind="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}" />
@@ -171,6 +171,17 @@
                                             Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
                                             Text="{TemplateBinding wpf:TextFieldAssist.SuffixText}" />
                                     </Grid>
+                                    <wpf:PackIcon
+                                        Grid.Column="2"
+                                        x:Name="TrailingPackIcon"
+                                        Margin="4 0 0 0"
+                                        VerticalAlignment="Center"
+                                        Height="{TemplateBinding wpf:TextFieldAssist.TrailingIconSize}"
+                                        Width="{TemplateBinding wpf:TextFieldAssist.TrailingIconSize}"
+                                        Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                                        Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                        Kind="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}" />
+
                                     <Button
                                         Grid.Column="2"
                                         x:Name="PART_ClearButton"