apply TextFieldAssist.ClearButtonSize on the Button rather than the PackIcon

Author: Corvin Szimion

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml

@@ -227,13 +227,14 @@
                         Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={x:Static converters:BooleanToVisibilityConverter.CollapsedInstance}}" />
 
                   <Button x:Name="PART_ClearButton"
-                  Grid.Column="5"
-                  Height="Auto"
-                  Padding="2,0,0,0"
-                  Command="{x:Static internal:ClearText.ClearCommand}"
-                  Focusable="False"
-                  VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
-                  Style="{StaticResource MaterialDesignToolButton}">
+                          Grid.Column="5"
+                          Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
+                          Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
+                          Padding="2,0,0,0"
+                          Command="{x:Static internal:ClearText.ClearCommand}"
+                          Focusable="False"
+                          VerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
+                          Style="{StaticResource MaterialDesignToolButton}">
                     <Button.Visibility>
                       <MultiBinding Converter="{StaticResource ClearButtonVisibilityConverter}">
                         <Binding Path="(wpf:TextFieldAssist.HasClearButton)" RelativeSource="{RelativeSource TemplatedParent}" />
@@ -243,8 +244,8 @@
                     <wpf:PackIcon x:Name="ClearButtonIcon"
                                   Margin="0"
                                   Kind="CloseCircle"
-                                  Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
-                                  Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"/>
+                                  Height="auto"
+                                  Width="auto" />
                   </Button>
                 </Grid>
               </Border>

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

@@ -470,7 +470,8 @@
 
               <Button x:Name="PART_ClearButton"
                       Grid.Column="5"
-                      Height="Auto"
+                      Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
+                      Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
                       Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
                       Padding="2,0,0,0"
                       Command="{x:Static internal:ClearText.ClearCommand}"
@@ -488,8 +489,8 @@
                 <wpf:PackIcon x:Name="ClearButtonIcon"
                               Margin="0"
                               Kind="CloseCircle"
-                              Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
-                              Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"/>
+                              Height="auto"
+                              Width="auto" />
               </Button>
             </Grid>
           </Grid>

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml

@@ -271,7 +271,8 @@
                   <Button x:Name="PART_ClearButton"
                           Foreground="{TemplateBinding Foreground}"
                           Grid.Column="5"
-                          Height="Auto"
+                          Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
+                          Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
                           Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
                           Padding="2,0,0,0"
                           Command="{x:Static internal:ClearText.ClearCommand}"
@@ -287,8 +288,8 @@
                     <wpf:PackIcon x:Name="ClearButtonIcon"
                                   Margin="0"
                                   Kind="CloseCircle"
-                                  Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
-                                  Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}" />
+                                  Height="auto"
+                                  Width="auto" />
                   </Button>
                 </Grid>
               </Border>
@@ -902,7 +903,8 @@
 
                   <Button x:Name="PART_ClearButton"
                           Grid.Column="6"
-                          Height="Auto"
+                          Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
+                          Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
                           Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
                           Padding="2,0,0,0"
                           Command="{x:Static internal:ClearText.ClearCommand}"
@@ -919,8 +921,8 @@
                     <wpf:PackIcon x:Name="ClearButtonIcon"
                                   Margin="0"
                                   Kind="CloseCircle"
-                                  Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
-                                  Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}" />
+                                  Height="auto"
+                                  Width="auto" />
                   </Button>
 
                 </Grid>

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

@@ -266,7 +266,8 @@
 
                   <Button x:Name="PART_ClearButton"
                           Grid.Column="5"
-                          Height="Auto"
+                          Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
+                          Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
                           Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
                           Padding="2,0,0,0"
                           Command="{x:Static internal:ClearText.ClearCommand}"
@@ -283,8 +284,8 @@
                     <wpf:PackIcon x:Name="ClearButtonIcon"
                                   Margin="0"
                                   Kind="CloseCircle"
-                                  Height="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}"
-                                  Width="{TemplateBinding wpf:TextFieldAssist.ClearButtonSize}" />
+                                  Height="auto"
+                                  Width="auto" />
                   </Button>
                 </Grid>
               </Border>