Skip to content

Commit fd662c2

Browse files
authored
Fix HelperText margin/padding #2738 (#2746)
1 parent a5d2256 commit fd662c2

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@
209209
Visibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}"
210210
CornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
211211
Background="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}" />
212-
<Canvas VerticalAlignment="Bottom">
212+
<Canvas x:Name="HelperTextWrapper"
213+
VerticalAlignment="Bottom">
213214
<TextBlock
214215
Canvas.Top="2"
215216
FontSize="{TemplateBinding wpf:HintAssist.HelperTextFontSize}"
@@ -254,14 +255,15 @@
254255
</Setter>
255256
</MultiTrigger>
256257
<Trigger Property="wpf:TextFieldAssist.HasFilledTextField" Value="True">
257-
<Setter Property="Padding" Value="16 8" />
258+
<Setter Property="Padding" Value="16 8 12 8" />
258259
<Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
260+
<Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
259261
</Trigger>
260262
<Trigger Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True">
261263
<Setter Property="VerticalContentAlignment" Value="Top" />
262264
<Setter Property="BorderThickness" Value="1" />
263265
<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaBorder}" />
264-
<Setter Property="Padding" Value="16" />
266+
<Setter Property="Padding" Value="16 16 12 16" />
265267
<Setter TargetName="Underline" Property="Visibility" Value="Collapsed" />
266268
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
267269
<Setter TargetName="HintWrapper" Property="Opacity"
@@ -277,6 +279,7 @@
277279
</MultiBinding>
278280
</Setter.Value>
279281
</Setter>
282+
<Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" />
280283
</Trigger>
281284
<MultiTrigger>
282285
<MultiTrigger.Conditions>

0 commit comments

Comments
 (0)