Skip to content

Commit bb264a0

Browse files
authored
properly apply TextFieldAssist.TextFieldCornerRadius to NumericUpDown template (#3792)
1 parent 9a63e40 commit bb264a0

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.NumericUpDown.xaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@
5555
<converters:NonDefaultThicknessConverter x:Key="OutlinedBorderInactiveThicknessConverter" DefaultThickness="{x:Static wpf:Constants.DefaultOutlinedBorderInactiveThickness}" />
5656
<converters:NonDefaultThicknessConverter x:Key="OutlinedBorderActiveThicknessConverter" DefaultThickness="{x:Static wpf:Constants.DefaultOutlinedBorderActiveThickness}" />
5757
</ControlTemplate.Resources>
58-
<Grid Background="{TemplateBinding Background}">
59-
<TextBox x:Name="PART_TextBox"
58+
<Border Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}">
59+
<Grid>
60+
<TextBox x:Name="PART_TextBox"
6061
Padding="{TemplateBinding Padding, Converter={StaticResource NumericUpDownPaddingConverter}}"
6162
VerticalAlignment="Stretch"
6263
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -101,21 +102,22 @@
101102
Focusable="{TemplateBinding Focusable}"
102103
Style="{DynamicResource NestedTextBoxStyle}" />
103104

104-
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
105-
<RepeatButton x:Name="PART_DecreaseButton"
105+
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
106+
<RepeatButton x:Name="PART_DecreaseButton"
106107
Margin="{TemplateBinding Padding, Converter={StaticResource PartButtonMarginConverter}}"
107108
Content="{TemplateBinding DecreaseContent}"
108109
Foreground="{Binding ElementName=PART_TextBox, Path=Foreground}"
109110
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
110111
Style="{DynamicResource NestedNumericUpDownButtonsStyle}" />
111-
<RepeatButton x:Name="PART_IncreaseButton"
112+
<RepeatButton x:Name="PART_IncreaseButton"
112113
Margin="{TemplateBinding Padding, Converter={StaticResource PartButtonMarginConverter}}"
113114
Content="{TemplateBinding IncreaseContent}"
114115
Foreground="{Binding ElementName=PART_TextBox, Path=Foreground}"
115116
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
116117
Style="{DynamicResource NestedNumericUpDownButtonsStyle}" />
117-
</StackPanel>
118-
</Grid>
118+
</StackPanel>
119+
</Grid>
120+
</Border>
119121
<ControlTemplate.Triggers>
120122
<!-- PART_Button hovering -->
121123
<MultiTrigger>

0 commit comments

Comments
 (0)