Skip to content

Commit 6cef2f5

Browse files
Forward HintAssist.HintPaddingBrush into nested TextBox of UpDown (#3857)
1 parent 7ddc81b commit 6cef2f5

File tree

1 file changed

+44
-43
lines changed

1 file changed

+44
-43
lines changed

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

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -58,49 +58,50 @@
5858
<Grid>
5959
<TextBox x:Name="PART_TextBox"
6060
Background="{TemplateBinding Background}"
61-
Padding="{TemplateBinding Padding, Converter={StaticResource NumericUpDownPaddingConverter}}"
62-
VerticalAlignment="Stretch"
63-
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
64-
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
65-
internal:InternalTextFieldAssist.IsMouseOver="{TemplateBinding IsMouseOver}"
66-
wpf:HintAssist.Background="{TemplateBinding wpf:HintAssist.Background}"
67-
wpf:HintAssist.FloatingOffset="{TemplateBinding wpf:HintAssist.FloatingOffset}"
68-
wpf:HintAssist.FloatingScale="{TemplateBinding wpf:HintAssist.FloatingScale}"
69-
wpf:HintAssist.FontFamily="{TemplateBinding wpf:HintAssist.FontFamily}"
70-
wpf:HintAssist.Foreground="{TemplateBinding wpf:HintAssist.Foreground}"
71-
wpf:HintAssist.HelperTextStyle="{TemplateBinding wpf:HintAssist.HelperTextStyle}"
72-
wpf:HintAssist.Hint="{TemplateBinding wpf:HintAssist.Hint}"
73-
wpf:HintAssist.HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
74-
wpf:HintAssist.IsFloating="{TemplateBinding wpf:HintAssist.IsFloating}"
75-
wpf:TextFieldAssist.DecorationVisibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}"
76-
wpf:TextFieldAssist.HasClearButton="{TemplateBinding wpf:TextFieldAssist.HasClearButton}"
77-
wpf:TextFieldAssist.HasFilledTextField="{TemplateBinding wpf:TextFieldAssist.HasFilledTextField}"
78-
wpf:TextFieldAssist.HasLeadingIcon="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon}"
79-
wpf:TextFieldAssist.HasOutlinedTextField="{TemplateBinding wpf:TextFieldAssist.HasOutlinedTextField}"
80-
wpf:TextFieldAssist.HasTrailingIcon="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon}"
81-
wpf:TextFieldAssist.IconVerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
82-
wpf:TextFieldAssist.LeadingIcon="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
83-
wpf:TextFieldAssist.LeadingIconSize="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
84-
wpf:TextFieldAssist.NewSpecHighlightingEnabled="{TemplateBinding wpf:TextFieldAssist.NewSpecHighlightingEnabled}"
85-
wpf:TextFieldAssist.OutlinedBorderActiveThickness="{TemplateBinding wpf:TextFieldAssist.OutlinedBorderActiveThickness}"
86-
wpf:TextFieldAssist.PrefixText="{TemplateBinding wpf:TextFieldAssist.PrefixText}"
87-
wpf:TextFieldAssist.PrefixTextHintBehavior="{TemplateBinding wpf:TextFieldAssist.PrefixTextHintBehavior}"
88-
wpf:TextFieldAssist.PrefixTextVisibility="{TemplateBinding wpf:TextFieldAssist.PrefixTextVisibility}"
89-
wpf:TextFieldAssist.RippleOnFocusEnabled="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled}"
90-
wpf:TextFieldAssist.SuffixText="{TemplateBinding wpf:TextFieldAssist.SuffixText}"
91-
wpf:TextFieldAssist.SuffixTextHintBehavior="{TemplateBinding wpf:TextFieldAssist.SuffixTextHintBehavior}"
92-
wpf:TextFieldAssist.SuffixTextVisibility="{TemplateBinding wpf:TextFieldAssist.SuffixTextVisibility}"
93-
wpf:TextFieldAssist.TextBoxViewMargin="{TemplateBinding wpf:TextFieldAssist.TextBoxViewMargin}"
94-
wpf:TextFieldAssist.TextBoxViewVerticalAlignment="{TemplateBinding wpf:TextFieldAssist.TextBoxViewVerticalAlignment}"
95-
wpf:TextFieldAssist.TextFieldCornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
96-
wpf:TextFieldAssist.TrailingIcon="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}"
97-
wpf:TextFieldAssist.TrailingIconSize="{TemplateBinding wpf:TextFieldAssist.TrailingIconSize}"
98-
wpf:TextFieldAssist.UnderlineBrush="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}"
99-
wpf:TextFieldAssist.UnderlineCornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
100-
BorderBrush="{TemplateBinding BorderBrush}"
101-
BorderThickness="{TemplateBinding BorderThickness}"
102-
Focusable="{TemplateBinding Focusable}"
103-
Style="{DynamicResource NestedTextBoxStyle}" />
61+
Padding="{TemplateBinding Padding, Converter={StaticResource NumericUpDownPaddingConverter}}"
62+
VerticalAlignment="Stretch"
63+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
64+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
65+
internal:InternalTextFieldAssist.IsMouseOver="{TemplateBinding IsMouseOver}"
66+
wpf:HintAssist.Background="{TemplateBinding wpf:HintAssist.Background}"
67+
wpf:HintAssist.FloatingOffset="{TemplateBinding wpf:HintAssist.FloatingOffset}"
68+
wpf:HintAssist.FloatingScale="{TemplateBinding wpf:HintAssist.FloatingScale}"
69+
wpf:HintAssist.FontFamily="{TemplateBinding wpf:HintAssist.FontFamily}"
70+
wpf:HintAssist.Foreground="{TemplateBinding wpf:HintAssist.Foreground}"
71+
wpf:HintAssist.HelperTextStyle="{TemplateBinding wpf:HintAssist.HelperTextStyle}"
72+
wpf:HintAssist.Hint="{TemplateBinding wpf:HintAssist.Hint}"
73+
wpf:HintAssist.HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
74+
wpf:HintAssist.HintPaddingBrush="{TemplateBinding wpf:HintAssist.HintPaddingBrush}"
75+
wpf:HintAssist.IsFloating="{TemplateBinding wpf:HintAssist.IsFloating}"
76+
wpf:TextFieldAssist.DecorationVisibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}"
77+
wpf:TextFieldAssist.HasClearButton="{TemplateBinding wpf:TextFieldAssist.HasClearButton}"
78+
wpf:TextFieldAssist.HasFilledTextField="{TemplateBinding wpf:TextFieldAssist.HasFilledTextField}"
79+
wpf:TextFieldAssist.HasLeadingIcon="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon}"
80+
wpf:TextFieldAssist.HasOutlinedTextField="{TemplateBinding wpf:TextFieldAssist.HasOutlinedTextField}"
81+
wpf:TextFieldAssist.HasTrailingIcon="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon}"
82+
wpf:TextFieldAssist.IconVerticalAlignment="{TemplateBinding wpf:TextFieldAssist.IconVerticalAlignment}"
83+
wpf:TextFieldAssist.LeadingIcon="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
84+
wpf:TextFieldAssist.LeadingIconSize="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
85+
wpf:TextFieldAssist.NewSpecHighlightingEnabled="{TemplateBinding wpf:TextFieldAssist.NewSpecHighlightingEnabled}"
86+
wpf:TextFieldAssist.OutlinedBorderActiveThickness="{TemplateBinding wpf:TextFieldAssist.OutlinedBorderActiveThickness}"
87+
wpf:TextFieldAssist.PrefixText="{TemplateBinding wpf:TextFieldAssist.PrefixText}"
88+
wpf:TextFieldAssist.PrefixTextHintBehavior="{TemplateBinding wpf:TextFieldAssist.PrefixTextHintBehavior}"
89+
wpf:TextFieldAssist.PrefixTextVisibility="{TemplateBinding wpf:TextFieldAssist.PrefixTextVisibility}"
90+
wpf:TextFieldAssist.RippleOnFocusEnabled="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled}"
91+
wpf:TextFieldAssist.SuffixText="{TemplateBinding wpf:TextFieldAssist.SuffixText}"
92+
wpf:TextFieldAssist.SuffixTextHintBehavior="{TemplateBinding wpf:TextFieldAssist.SuffixTextHintBehavior}"
93+
wpf:TextFieldAssist.SuffixTextVisibility="{TemplateBinding wpf:TextFieldAssist.SuffixTextVisibility}"
94+
wpf:TextFieldAssist.TextBoxViewMargin="{TemplateBinding wpf:TextFieldAssist.TextBoxViewMargin}"
95+
wpf:TextFieldAssist.TextBoxViewVerticalAlignment="{TemplateBinding wpf:TextFieldAssist.TextBoxViewVerticalAlignment}"
96+
wpf:TextFieldAssist.TextFieldCornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
97+
wpf:TextFieldAssist.TrailingIcon="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}"
98+
wpf:TextFieldAssist.TrailingIconSize="{TemplateBinding wpf:TextFieldAssist.TrailingIconSize}"
99+
wpf:TextFieldAssist.UnderlineBrush="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}"
100+
wpf:TextFieldAssist.UnderlineCornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
101+
BorderBrush="{TemplateBinding BorderBrush}"
102+
BorderThickness="{TemplateBinding BorderThickness}"
103+
Focusable="{TemplateBinding Focusable}"
104+
Style="{DynamicResource NestedTextBoxStyle}" />
104105

105106
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
106107
<RepeatButton x:Name="PART_DecreaseButton"

0 commit comments

Comments
 (0)