Extract TextBox.Padding setters into style overrides instead of triggers

Author: nicolaihenriksen

MainDemo.Wpf/MainWindow.xaml

@@ -60,13 +60,11 @@
  Width="200"
  Margin="16,4"
  materialDesign:HintAssist.Hint="Search"
- materialDesign:HintAssist.IsFloating="True"
  materialDesign:TextFieldAssist.DecorationVisibility="Collapsed"
  materialDesign:TextFieldAssist.HasClearButton="True"
- materialDesign:TextFieldAssist.HasOutlinedTextField="True"
- materialDesign:TextFieldAssist.TextFieldCornerRadius="4"
  DockPanel.Dock="Top"
- Text="{Binding SearchKeyword, UpdateSourceTrigger=PropertyChanged}" />
+ Text="{Binding SearchKeyword, UpdateSourceTrigger=PropertyChanged}"
+ Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
 
  <ListBox x:Name="DemoItemsListBox"
  Margin="0,16,0,16"

MaterialDesignThemes.Wpf/Constants.cs

@@ -3,6 +3,8 @@ namespace MaterialDesignThemes.Wpf;
 public static class Constants
 {
  public static readonly Thickness TextBoxDefaultPadding = new Thickness(0, 4, 0, 4);
+ public static readonly Thickness FilledTextBoxDefaultPadding = new Thickness(16, 8, 12, 8);
+ public static readonly Thickness OutlinedTextBoxDefaultPadding = new Thickness(16, 16, 12, 16);
  public static readonly Thickness DefaultTextBoxViewMargin = new Thickness(1, 0, 1, 0);
  public static readonly Thickness DefaultTextBoxViewMarginEmbedded = new Thickness(0);
  public const double TextBoxNotEnabledOpacity = 0.56;

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

@@ -303,14 +303,12 @@
  </MultiTrigger>
  <Trigger Property="wpf:TextFieldAssist.HasFilledTextField" Value="True">
  <Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
- <Setter Property="Padding" Value="16,8,12,8" />
  <Setter TargetName="Hint" Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMarginEmbedded}" />
  <Setter TargetName="HelperTextTextBlock" Property="Margin" Value="16,0,0,0" />
  </Trigger>
  <Trigger Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True">
  <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaBorder}" />
  <Setter Property="BorderThickness" Value="1" />
- <Setter Property="Padding" Value="16,16,12,16" />
  <Setter TargetName="Hint" Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMarginEmbedded}" />
  <Setter TargetName="HelperTextTextBlock" Property="Margin" Value="16,0,0,0" />
  <Setter TargetName="Hint" Property="FloatingOffset">
@@ -512,13 +510,15 @@
  <Setter Property="wpf:TextFieldAssist.HasFilledTextField" Value="True" />
  <Setter Property="wpf:TextFieldAssist.TextFieldCornerRadius" Value="4,4,0,0" />
  <Setter Property="wpf:TextFieldAssist.UnderlineCornerRadius" Value="0" />
+ <Setter Property="Padding" Value="{x:Static wpf:Constants.FilledTextBoxDefaultPadding}" />
  </Style>
 
  <Style x:Key="MaterialDesignOutlinedTextBox"
  TargetType="{x:Type TextBox}"
  BasedOn="{StaticResource MaterialDesignFloatingHintTextBox}">
  <Setter Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
  <Setter Property="wpf:TextFieldAssist.TextFieldCornerRadius" Value="4" />
+ <Setter Property="Padding" Value="{x:Static wpf:Constants.OutlinedTextBoxDefaultPadding}" />
  </Style>
 
 </ResourceDictionary>