|
55 | 55 | <converters:NonDefaultThicknessConverter x:Key="OutlinedBorderInactiveThicknessConverter" DefaultThickness="{x:Static wpf:Constants.DefaultOutlinedBorderInactiveThickness}" /> |
56 | 56 | <converters:NonDefaultThicknessConverter x:Key="OutlinedBorderActiveThicknessConverter" DefaultThickness="{x:Static wpf:Constants.DefaultOutlinedBorderActiveThickness}" /> |
57 | 57 | </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" |
60 | 61 | Padding="{TemplateBinding Padding, Converter={StaticResource NumericUpDownPaddingConverter}}" |
61 | 62 | VerticalAlignment="Stretch" |
62 | 63 | HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" |
|
101 | 102 | Focusable="{TemplateBinding Focusable}" |
102 | 103 | Style="{DynamicResource NestedTextBoxStyle}" /> |
103 | 104 |
|
104 | | - <StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> |
105 | | - <RepeatButton x:Name="PART_DecreaseButton" |
| 105 | + <StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> |
| 106 | + <RepeatButton x:Name="PART_DecreaseButton" |
106 | 107 | Margin="{TemplateBinding Padding, Converter={StaticResource PartButtonMarginConverter}}" |
107 | 108 | Content="{TemplateBinding DecreaseContent}" |
108 | 109 | Foreground="{Binding ElementName=PART_TextBox, Path=Foreground}" |
109 | 110 | Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}" |
110 | 111 | Style="{DynamicResource NestedNumericUpDownButtonsStyle}" /> |
111 | | - <RepeatButton x:Name="PART_IncreaseButton" |
| 112 | + <RepeatButton x:Name="PART_IncreaseButton" |
112 | 113 | Margin="{TemplateBinding Padding, Converter={StaticResource PartButtonMarginConverter}}" |
113 | 114 | Content="{TemplateBinding IncreaseContent}" |
114 | 115 | Foreground="{Binding ElementName=PART_TextBox, Path=Foreground}" |
115 | 116 | Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}" |
116 | 117 | Style="{DynamicResource NestedNumericUpDownButtonsStyle}" /> |
117 | | - </StackPanel> |
118 | | - </Grid> |
| 118 | + </StackPanel> |
| 119 | + </Grid> |
| 120 | + </Border> |
119 | 121 | <ControlTemplate.Triggers> |
120 | 122 | <!-- PART_Button hovering --> |
121 | 123 | <MultiTrigger> |
|
0 commit comments