Skip to content

Commit d9a70dd

Browse files
Text field focus fix (#1724)
* Added in a template binding to the background property in the MaterialDesignDatePicker, this now makes it so when setting Background on a datepicker it will reflect the change. * Change the clear buttons on the ComboBox, PasswordBox and the TextBox to not allow focussing any longer. Fixes #1464
1 parent fbac9e8 commit d9a70dd

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@
471471
Opacity="{Binding Path=(wpf:HintAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"
472472
Text="{Binding Path=(wpf:TextFieldAssist.SuffixText), RelativeSource={RelativeSource TemplatedParent}}"
473473
/>
474-
<Button x:Name="PART_ClearButton" Height="Auto" Padding="2,0,-6,0" Style="{DynamicResource MaterialDesignToolButton}">
474+
<Button x:Name="PART_ClearButton" Height="Auto" Padding="2,0,-6,0" Style="{DynamicResource MaterialDesignToolButton}" Focusable="False">
475475
<Button.Visibility>
476476
<MultiBinding Converter="{StaticResource ClearTextConverter}">
477477
<Binding ElementName="Hint" Path="IsContentNullOrEmpty" Converter="{StaticResource NotConverter}"/>
@@ -781,7 +781,7 @@
781781
Opacity="{Binding Path=(wpf:HintAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"
782782
Text="{Binding Path=(wpf:TextFieldAssist.SuffixText), RelativeSource={RelativeSource TemplatedParent}}"
783783
/>
784-
<Button x:Name="PART_ClearButton" Height="Auto" Padding="2,0,-6,0" Style="{DynamicResource MaterialDesignToolButton}">
784+
<Button x:Name="PART_ClearButton" Height="Auto" Padding="2,0,-6,0" Style="{DynamicResource MaterialDesignToolButton}" Focusable="false">
785785
<Button.Visibility>
786786
<MultiBinding Converter="{StaticResource ClearTextConverter}">
787787
<Binding ElementName="Hint" Path="IsContentNullOrEmpty" Converter="{StaticResource NotConverter}"/>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
</Border>
133133
</wpf:SmartHint.Hint>
134134
</wpf:SmartHint>
135-
<Button x:Name="PART_ClearButton" Height="Auto" Grid.Column="1" Padding="2,0,0,0"
135+
<Button x:Name="PART_ClearButton" Height="Auto" Grid.Column="1" Padding="2,0,0,0" Focusable="false"
136136
Style="{DynamicResource MaterialDesignToolButton}" VerticalAlignment="Top">
137137
<Button.Visibility>
138138
<MultiBinding Converter="{StaticResource ClearTextConverter}">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
Opacity="{Binding Path=(wpf:HintAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"
140140
Text="{Binding Path=(wpf:TextFieldAssist.SuffixText), RelativeSource={RelativeSource TemplatedParent}}"
141141
/>
142-
<Button x:Name="PART_ClearButton" Height="Auto" Padding="2,0,0,0"
142+
<Button x:Name="PART_ClearButton" Height="Auto" Padding="2,0,0,0" Focusable="False"
143143
Style="{DynamicResource MaterialDesignToolButton}">
144144
<Button.Visibility>
145145
<MultiBinding Converter="{StaticResource ClearTextConverter}">

0 commit comments

Comments
 (0)