Skip to content

Commit e6c1f28

Browse files
TextBox padding specs update + HelperText padding added for Outlined and Filled TextBox style (#2217)
Co-authored-by: Michel Michels <[email protected]>
1 parent 752c892 commit e6c1f28

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,11 @@
179179
Visibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}"
180180
CornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
181181
Background="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}" />
182-
<Canvas VerticalAlignment="Bottom">
182+
<Canvas
183+
x:Name="HelperTextWrapper"
184+
VerticalAlignment="Bottom">
183185
<TextBlock
184-
Canvas.Top="2"
186+
Canvas.Top="2"
185187
FontSize="{TemplateBinding wpf:HintAssist.HelperTextFontSize}"
186188
MaxWidth="{Binding ActualWidth, ElementName=border}"
187189
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
@@ -222,15 +224,16 @@
222224
</Setter>
223225
</MultiTrigger>
224226
<Trigger Property="wpf:TextFieldAssist.HasFilledTextField" Value="True">
225-
<Setter Property="Padding" Value="16 8" />
227+
<Setter Property="Padding" Value="16 8 12 8" />
226228
<Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
227229
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMarginEmbedded}" />
230+
<Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
228231
</Trigger>
229232
<Trigger Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True">
230233
<Setter Property="VerticalContentAlignment" Value="Top" />
231234
<Setter Property="BorderThickness" Value="1" />
232235
<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaBorder}" />
233-
<Setter Property="Padding" Value="16" />
236+
<Setter Property="Padding" Value="16 16 12 16" />
234237
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMarginEmbedded}" />
235238
<Setter TargetName="Underline" Property="Visibility" Value="Collapsed" />
236239
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
@@ -246,6 +249,7 @@
246249
</MultiBinding>
247250
</Setter.Value>
248251
</Setter>
252+
<Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
249253
</Trigger>
250254
<MultiTrigger>
251255
<MultiTrigger.Conditions>

0 commit comments

Comments
 (0)