Skip to content

Commit 1af11d0

Browse files
ButchersBoyButchersBoy
authored
Merge pull request #405 from EdonGashi/master
Floating hints animate to HintOpacity instead of 100%
2 parents 95e6a63 + 14c6f03 commit 1af11d0

6 files changed

+19
-3
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,20 +492,23 @@
492492
<Condition Property="IsKeyboardFocused" Value="True" />
493493
</MultiTrigger.Conditions>
494494
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
495+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
495496
</MultiTrigger>
496497
<MultiTrigger>
497498
<MultiTrigger.Conditions>
498499
<Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
499500
<Condition SourceName="PART_EditableTextBox" Property="IsKeyboardFocused" Value="True" />
500501
</MultiTrigger.Conditions>
501502
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
503+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
502504
</MultiTrigger>
503505
<MultiTrigger>
504506
<MultiTrigger.Conditions>
505507
<Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
506508
<Condition Property="IsDropDownOpen" Value="True" />
507509
</MultiTrigger.Conditions>
508510
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
511+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
509512
</MultiTrigger>
510513
<MultiTrigger>
511514
<MultiTrigger.Conditions>

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<Condition Property="IsKeyboardFocused" Value="True" />
7171
</MultiTrigger.Conditions>
7272
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
73+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
7374
</MultiTrigger>
7475
</ControlTemplate.Triggers>
7576
</ControlTemplate>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<Condition Property="IsKeyboardFocused" Value="True" />
6161
</MultiTrigger.Conditions>
6262
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
63+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
6364
</MultiTrigger>
6465
<Trigger Property="wpf:HintAssist.IsFloating" Value="True">
6566
<Setter TargetName="border" Property="Padding" Value="0 15.5 0 4" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<DoubleAnimation Storyboard.TargetName="SimpleHintTextBlock" Storyboard.TargetProperty="Opacity"
3030
Duration="0:0:0" To="0" />
3131
<DoubleAnimation Storyboard.TargetName="FloatingHintTextBlock" Storyboard.TargetProperty="Opacity"
32-
Duration="0:0:0.3" To="1"
32+
Duration="0:0:0.3" To="{TemplateBinding HintOpacity}"
3333
EasingFunction="{StaticResource AnimationEasingFunction}"/>
3434
<DoubleAnimation Storyboard.TargetName="FloatingHintTextBlock" Storyboard.TargetProperty="(Control.RenderTransform).(TransformGroup.Children)[1].(ScaleTransform.ScaleX)"
3535
Duration="0:0:0.3" To=".74"
@@ -73,7 +73,7 @@
7373
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SimpleHintTextBlock"
7474
Duration="0" To="0" />
7575
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="FloatingHintTextBlock"
76-
Duration="0" To="1" />
76+
Duration="0" To="{TemplateBinding HintOpacity}" />
7777
<DoubleAnimation Storyboard.TargetName="FloatingHintTextBlock" Storyboard.TargetProperty="(Control.RenderTransform).(TransformGroup.Children)[1].(ScaleTransform.ScaleX)"
7878
Duration="0" To=".74" />
7979
<DoubleAnimation Storyboard.TargetName="FloatingHintTextBlock" Storyboard.TargetProperty="(Control.RenderTransform).(TransformGroup.Children)[1].(ScaleTransform.ScaleY)"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
<Condition Property="IsKeyboardFocused" Value="True" />
9595
</MultiTrigger.Conditions>
9696
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
97+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
9798
</MultiTrigger>
9899
<Trigger Property="wpf:HintAssist.IsFloating" Value="True">
99100
<Setter TargetName="border" Property="Margin" Value="0 12 0 0" />

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,17 @@
6060
HintProxy="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static converters:HintProxyFabricConverter.Instance}}"
6161
HintOpacity="{Binding Path=(wpf:HintAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"/>
6262
</Grid>
63-
</ControlTemplate>
63+
<ControlTemplate.Triggers>
64+
<MultiTrigger>
65+
<MultiTrigger.Conditions>
66+
<Condition SourceName="Hint" Property="IsContentNullOrEmpty" Value="False" />
67+
<Condition Property="IsKeyboardFocused" Value="True" />
68+
</MultiTrigger.Conditions>
69+
<Setter TargetName="Hint" Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
70+
<Setter TargetName="Hint" Property="HintOpacity" Value="1" />
71+
</MultiTrigger>
72+
</ControlTemplate.Triggers>
73+
</ControlTemplate>
6474
<ControlTemplate x:Key="DropDownButtonTemplate" TargetType="{x:Type Button}">
6575
<Grid Background="Transparent">
6676
<VisualStateManager.VisualStateGroups>

0 commit comments

Comments
 (0)