Skip to content

Commit 8857b0a

Browse files
nicolaihenriksennicolaihenriksen
authored
[SmartHint] Bug fix - fixes bug introduced in previous PR (#3711)
* Add supporting AP for the HintPaddingBrush * Reintroduce style triggers to set supporting AP
1 parent a8dde55 commit 8857b0a

6 files changed

+57
-2
lines changed

‎src/MaterialDesignThemes.Wpf/HintAssist.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,17 @@ public static void SetHintPaddingBrush(DependencyObject obj, Brush? value)
130130
=> obj.SetValue(HintPaddingBrushProperty, value);
131131
#endregion
132132

133+
#region AttachedProperty: ApplyHintPaddingBrush
134+
public static readonly DependencyProperty ApplyHintPaddingBrushProperty =
135+
DependencyProperty.RegisterAttached("ApplyHintPaddingBrush", typeof(bool), typeof(HintAssist), new PropertyMetadata(false));
136+
137+
public static bool GetApplyHintPaddingBrush(DependencyObject obj)
138+
=> (bool)obj.GetValue(ApplyHintPaddingBrushProperty);
139+
140+
public static void SetApplyHintPaddingBrush(DependencyObject obj, bool value)
141+
=> obj.SetValue(ApplyHintPaddingBrushProperty, value);
142+
#endregion
143+
133144
#region AttachedProperty : HelperTextProperty
134145
public static readonly DependencyProperty HelperTextProperty
135146
= DependencyProperty.RegisterAttached("HelperText", typeof(string), typeof(HintAssist),

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,14 @@
370370
<Setter TargetName="Hint" Property="FloatingMargin" Value="4,0" />
371371
<Setter TargetName="Hint" Property="InitialVerticalOffset" Value="{Binding ElementName=Hint, Path=ActualHeight, Converter={StaticResource DivisionConverter}, ConverterParameter=2}" />
372372
</Trigger>
373+
<MultiTrigger>
374+
<MultiTrigger.Conditions>
375+
<Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
376+
<Condition Property="wpf:HintAssist.IsFloating" Value="True" />
377+
<Condition SourceName="Hint" Property="IsHintInFloatingPosition" Value="True" />
378+
</MultiTrigger.Conditions>
379+
<Setter TargetName="Hint" Property="wpf:HintAssist.ApplyHintPaddingBrush" Value="True" />
380+
</MultiTrigger>
373381

374382
<!-- IsEnabled -->
375383
<MultiTrigger>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,14 @@
596596
<Setter TargetName="Hint" Property="FloatingMargin" Value="4,0" />
597597
<Setter TargetName="Hint" Property="InitialVerticalOffset" Value="{Binding ElementName=Hint, Path=ActualHeight, Converter={StaticResource DivisionConverter}, ConverterParameter=2}" />
598598
</Trigger>
599+
<MultiTrigger>
600+
<MultiTrigger.Conditions>
601+
<Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
602+
<Condition Property="wpf:HintAssist.IsFloating" Value="True" />
603+
<Condition SourceName="Hint" Property="IsHintInFloatingPosition" Value="True" />
604+
</MultiTrigger.Conditions>
605+
<Setter TargetName="Hint" Property="wpf:HintAssist.ApplyHintPaddingBrush" Value="True" />
606+
</MultiTrigger>
599607

600608
<!-- Floating hint -->
601609
<MultiTrigger>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,14 @@
362362
<Setter TargetName="Hint" Property="FloatingMargin" Value="4,0" />
363363
<Setter TargetName="Hint" Property="InitialVerticalOffset" Value="{Binding ElementName=Hint, Path=ActualHeight, Converter={StaticResource DivisionConverter}, ConverterParameter=2}" />
364364
</Trigger>
365+
<MultiTrigger>
366+
<MultiTrigger.Conditions>
367+
<Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
368+
<Condition Property="wpf:HintAssist.IsFloating" Value="True" />
369+
<Condition SourceName="Hint" Property="IsHintInFloatingPosition" Value="True" />
370+
</MultiTrigger.Conditions>
371+
<Setter TargetName="Hint" Property="wpf:HintAssist.ApplyHintPaddingBrush" Value="True" />
372+
</MultiTrigger>
365373

366374
<!-- IsEnabled -->
367375
<MultiTrigger>
@@ -994,6 +1002,14 @@
9941002
<Setter TargetName="Hint" Property="FloatingMargin" Value="4,0" />
9951003
<Setter TargetName="Hint" Property="InitialVerticalOffset" Value="{Binding ElementName=Hint, Path=ActualHeight, Converter={StaticResource DivisionConverter}, ConverterParameter=2}" />
9961004
</Trigger>
1005+
<MultiTrigger>
1006+
<MultiTrigger.Conditions>
1007+
<Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
1008+
<Condition Property="wpf:HintAssist.IsFloating" Value="True" />
1009+
<Condition SourceName="Hint" Property="IsHintInFloatingPosition" Value="True" />
1010+
</MultiTrigger.Conditions>
1011+
<Setter TargetName="Hint" Property="wpf:HintAssist.ApplyHintPaddingBrush" Value="True" />
1012+
</MultiTrigger>
9971013

9981014
<!-- IsEnabled -->
9991015
<MultiTrigger>

‎src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,11 @@
229229
</Grid>
230230
</Grid>
231231
<ControlTemplate.Triggers>
232-
<Trigger Property="IsHintInFloatingPosition" Value="True">
232+
<MultiTrigger>
233+
<MultiTrigger.Conditions>
234+
<Condition Property="IsHintInFloatingPosition" Value="True" />
235+
<Condition Property="wpf:HintAssist.ApplyHintPaddingBrush" Value="True" />
236+
</MultiTrigger.Conditions>
233237
<Setter TargetName="HintBackgroundGrid" Property="Background">
234238
<Setter.Value>
235239
<MultiBinding Converter="{StaticResource FirstNonNullConverter}">
@@ -238,7 +242,7 @@
238242
</MultiBinding>
239243
</Setter.Value>
240244
</Setter>
241-
</Trigger>
245+
</MultiTrigger>
242246
</ControlTemplate.Triggers>
243247
</ControlTemplate>
244248
</Setter.Value>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,14 @@
386386
<Setter TargetName="Hint" Property="FloatingMargin" Value="4,0" />
387387
<Setter TargetName="Hint" Property="InitialVerticalOffset" Value="{Binding ElementName=Hint, Path=ActualHeight, Converter={StaticResource DivisionConverter}, ConverterParameter=2}" />
388388
</Trigger>
389+
<MultiTrigger>
390+
<MultiTrigger.Conditions>
391+
<Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
392+
<Condition Property="wpf:HintAssist.IsFloating" Value="True" />
393+
<Condition SourceName="Hint" Property="IsHintInFloatingPosition" Value="True" />
394+
</MultiTrigger.Conditions>
395+
<Setter TargetName="Hint" Property="wpf:HintAssist.ApplyHintPaddingBrush" Value="True" />
396+
</MultiTrigger>
389397

390398
<!-- IsEnabled -->
391399
<MultiTrigger>

0 commit comments

Comments
 (0)