Skip to content

Apply TextFieldAssist.TextFieldCornerRadius to NumericUpDown #3792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2025
Merged

Apply TextFieldAssist.TextFieldCornerRadius to NumericUpDown #3792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.NumericUpDown.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@
<converters:NonDefaultThicknessConverter x:Key="OutlinedBorderInactiveThicknessConverter" DefaultThickness="{x:Static wpf:Constants.DefaultOutlinedBorderInactiveThickness}" />
<converters:NonDefaultThicknessConverter x:Key="OutlinedBorderActiveThicknessConverter" DefaultThickness="{x:Static wpf:Constants.DefaultOutlinedBorderActiveThickness}" />
</ControlTemplate.Resources>
<Grid Background="{TemplateBinding Background}">
<TextBox x:Name="PART_TextBox"
<Border Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}">
<Grid>
<TextBox x:Name="PART_TextBox"
Padding="{TemplateBinding Padding, Converter={StaticResource NumericUpDownPaddingConverter}}"
VerticalAlignment="Stretch"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Expand Down Expand Up @@ -101,21 +102,22 @@
Focusable="{TemplateBinding Focusable}"
Style="{DynamicResource NestedTextBoxStyle}" />

<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<RepeatButton x:Name="PART_DecreaseButton"
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<RepeatButton x:Name="PART_DecreaseButton"
Margin="{TemplateBinding Padding, Converter={StaticResource PartButtonMarginConverter}}"
Content="{TemplateBinding DecreaseContent}"
Foreground="{Binding ElementName=PART_TextBox, Path=Foreground}"
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
Style="{DynamicResource NestedNumericUpDownButtonsStyle}" />
<RepeatButton x:Name="PART_IncreaseButton"
<RepeatButton x:Name="PART_IncreaseButton"
Margin="{TemplateBinding Padding, Converter={StaticResource PartButtonMarginConverter}}"
Content="{TemplateBinding IncreaseContent}"
Foreground="{Binding ElementName=PART_TextBox, Path=Foreground}"
Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
Style="{DynamicResource NestedNumericUpDownButtonsStyle}" />
</StackPanel>
</Grid>
</StackPanel>
</Grid>
</Border>
<ControlTemplate.Triggers>
<!-- PART_Button hovering -->
<MultiTrigger>
Expand Down
Loading