Skip to content

Commit b082c35

Browse files
authored
Default the TextBoxBase/PasswordBox SelectionBrush to PrimaryHueLightBrush as per the material spec https://material.io/design/color/text-legibility.html#text-types (#2469)
1 parent c603146 commit b082c35

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMargin}" />
2121
<Setter Property="Background" Value="Transparent"/>
2222
<Setter Property="CaretBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
23+
<Setter Property="SelectionBrush" Value="{DynamicResource PrimaryHueLightBrush}" />
2324
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
2425
<Setter Property="VerticalContentAlignment" Value="Top"/>
2526
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
@@ -392,16 +393,7 @@
392393
</ControlTemplate.Triggers>
393394
</ControlTemplate>
394395
</Setter.Value>
395-
</Setter>
396-
<Style.Triggers>
397-
<MultiTrigger>
398-
<MultiTrigger.Conditions>
399-
<Condition Property="IsInactiveSelectionHighlightEnabled" Value="true"/>
400-
<Condition Property="IsSelectionActive" Value="false"/>
401-
</MultiTrigger.Conditions>
402-
<Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}"/>
403-
</MultiTrigger>
404-
</Style.Triggers>
396+
</Setter>
405397
</Style>
406398

407399
<Style x:Key="MaterialDesignFloatingHintPasswordBox" TargetType="{x:Type PasswordBox}" BasedOn="{StaticResource MaterialDesignPasswordBox}">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="{x:Static wpf:Constants.DefaultTextBoxViewMargin}" />
4444
<Setter Property="Background" Value="Transparent"/>
4545
<Setter Property="CaretBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
46+
<Setter Property="SelectionBrush" Value="{DynamicResource PrimaryHueLightBrush}" />
4647
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
4748
<Setter Property="VerticalContentAlignment" Value="Top"/>
4849
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
@@ -481,16 +482,7 @@
481482
</ControlTemplate.Triggers>
482483
</ControlTemplate>
483484
</Setter.Value>
484-
</Setter>
485-
<Style.Triggers>
486-
<MultiTrigger>
487-
<MultiTrigger.Conditions>
488-
<Condition Property="IsInactiveSelectionHighlightEnabled" Value="true"/>
489-
<Condition Property="IsSelectionActive" Value="false"/>
490-
</MultiTrigger.Conditions>
491-
<Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}"/>
492-
</MultiTrigger>
493-
</Style.Triggers>
485+
</Setter>
494486
</Style>
495487

496488
<Style x:Key="MaterialDesignTextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBoxBase}" />

0 commit comments

Comments
 (0)