|
179 | 179 | Visibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}"
|
180 | 180 | CornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
|
181 | 181 | Background="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}" />
|
182 |
| - <Canvas VerticalAlignment="Bottom"> |
| 182 | + <Canvas |
| 183 | + x:Name="HelperTextWrapper" |
| 184 | + VerticalAlignment="Bottom"> |
183 | 185 | <TextBlock
|
184 |
| - Canvas.Top="2" |
| 186 | + Canvas.Top="2" |
185 | 187 | FontSize="{TemplateBinding wpf:HintAssist.HelperTextFontSize}"
|
186 | 188 | MaxWidth="{Binding ActualWidth, ElementName=border}"
|
187 | 189 | Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
|
|
222 | 224 | </Setter>
|
223 | 225 | </MultiTrigger>
|
224 | 226 | <Trigger Property="wpf:TextFieldAssist.HasFilledTextField" Value="True">
|
225 |
| - <Setter Property="Padding" Value="16 8" /> |
| 227 | + <Setter Property="Padding" Value="16 8 12 8" /> |
226 | 228 | <Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
|
227 | 229 | <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMarginEmbedded}" />
|
| 230 | + <Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" /> |
228 | 231 | </Trigger>
|
229 | 232 | <Trigger Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True">
|
230 | 233 | <Setter Property="VerticalContentAlignment" Value="Top" />
|
231 | 234 | <Setter Property="BorderThickness" Value="1" />
|
232 | 235 | <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaBorder}" />
|
233 |
| - <Setter Property="Padding" Value="16" /> |
| 236 | + <Setter Property="Padding" Value="16 16 12 16" /> |
234 | 237 | <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMarginEmbedded}" />
|
235 | 238 | <Setter TargetName="Underline" Property="Visibility" Value="Collapsed" />
|
236 | 239 | <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
|
|
246 | 249 | </MultiBinding>
|
247 | 250 | </Setter.Value>
|
248 | 251 | </Setter>
|
| 252 | + <Setter TargetName="HelperTextWrapper" Property="Margin" Value="16 0 0 0" /> |
249 | 253 | </Trigger>
|
250 | 254 | <MultiTrigger>
|
251 | 255 | <MultiTrigger.Conditions>
|
|
0 commit comments