Skip to content

Align NumericUpDown style with other controls #3615

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
Keboo merged 8 commits into from
Jun 27, 2024
Merged

Align NumericUpDown style with other controls #3615

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
28552eb
Add NumericUpDown to FieldsLineUp
michaelmairegger Jun 24, 2024
95596e1
Align NumericUpDown style to other controls
michaelmairegger Jun 24, 2024
0391787
Respect values for IncreaseContent and DecreaseContent
michaelmairegger Jun 24, 2024
c2c515d
Add NumericUpDown to Material2 FieldsLineUp
michaelmairegger Jun 24, 2024
95bc2f2
Rename PART_TextBox
michaelmairegger Jun 24, 2024
91020d7
Fixing obsolete message on assist classes.
Keboo Jun 27, 2024
e09da73
Updated NumericUpDown styles to not leverage obsolete attached proper…
Keboo Jun 27, 2024
8f07dbf
Fixing UI tests
Keboo Jun 27, 2024
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
Prev Previous commit
Next Next commit
Updated NumericUpDown styles to not leverage obsolete attached proper… 
…ties.
  • Loading branch information
@Keboo
Keboo committed Jun 27, 2024
commit e09da7353a2d2861aedd8576d21a1b248c6bcd88
2 changes: 1 addition & 1 deletion src/MainDemo.Wpf/Domain/MainWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
};

yield return new DemoItem(
"Field line up",
"Fields line up",
typeof(FieldsLineUp),
new[]
{
Expand Down
8 changes: 5 additions & 3 deletions src/MainDemo.Wpf/FieldsLineUp.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@

<GroupBox HorizontalAlignment="Left"
VerticalAlignment="Top"
materialDesign:ColorZoneAssist.Background="{DynamicResource PrimaryHueLightBrush}"
materialDesign:ColorZoneAssist.Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
BorderBrush="{DynamicResource MaterialDesign.Brush.Primary}"
BorderThickness="1"
materialDesign:ColorZoneAssist.Background="{DynamicResource MaterialDesign.Brush.Background}"
materialDesign:ColorZoneAssist.Foreground="{DynamicResource MaterialDesign.Brush.Foreground}"
materialDesign:ColorZoneAssist.Mode="Custom">
<GroupBox.Header>
<StackPanel Orientation="Horizontal">
Expand Down Expand Up @@ -81,7 +83,7 @@
<Style TargetType="TextBox" BasedOn="{StaticResource MaterialDesignTextBox}">
<Setter Property="FontFamily" Value="Consolas" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Margin" Value="10,2" />
<Setter Property="Margin" Value="10,6" />
<Setter Property="MinWidth" Value="200" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="materialDesign:HintAssist.IsFloating" Value="True" />
Expand Down
17 changes: 3 additions & 14 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 @@ -44,6 +44,7 @@
</ControlTemplate.Resources>
<Grid>
<TextBox x:Name="PART_TextBox"
BorderThickness="{TemplateBinding BorderThickness}"
Padding="{TemplateBinding Padding, Converter={StaticResource NumericUpDownPaddingConverter}}"
VerticalAlignment="Stretch"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Expand All @@ -68,6 +69,7 @@
wpf:TextFieldAssist.HasFilledTextField="{TemplateBinding wpf:TextFieldAssist.HasFilledTextField}"
wpf:TextFieldAssist.HasOutlinedTextField="{TemplateBinding wpf:TextFieldAssist.HasOutlinedTextField}"
wpf:TextFieldAssist.NewSpecHighlightingEnabled="{TemplateBinding wpf:TextFieldAssist.NewSpecHighlightingEnabled}"
wpf:TextFieldAssist.OutlinedBorderActiveThickness="{TemplateBinding wpf:TextFieldAssist.OutlinedBorderActiveThickness}"
wpf:TextFieldAssist.PrefixText="{TemplateBinding wpf:TextFieldAssist.PrefixText}"
wpf:TextFieldAssist.PrefixTextVisibility="{TemplateBinding wpf:TextFieldAssist.PrefixTextVisibility}"
wpf:TextFieldAssist.PrefixTextHintBehavior="{TemplateBinding wpf:TextFieldAssist.PrefixTextHintBehavior}"
Expand All @@ -84,20 +86,7 @@
internal:InternalTextFieldAssist.IsMouseOver="{TemplateBinding IsMouseOver}"
BorderBrush="{TemplateBinding BorderBrush}"
Focusable="{TemplateBinding Focusable}"
Style="{DynamicResource NestedTextBoxStyle}">
<TextBox.BorderThickness>
<PriorityBinding>
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TimePickerAssist.OutlinedBorderInactiveThickness)" Converter="{StaticResource OutlinedBorderInactiveThicknessConverter}" />
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BorderThickness" />
</PriorityBinding>
</TextBox.BorderThickness>
<wpf:TextFieldAssist.OutlinedBorderActiveThickness>
<PriorityBinding>
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TimePickerAssist.OutlinedBorderActiveThickness)" Converter="{StaticResource OutlinedBorderActiveThicknessConverter}" />
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:TextFieldAssist.OutlinedBorderActiveThickness)" />
</PriorityBinding>
</wpf:TextFieldAssist.OutlinedBorderActiveThickness>
</TextBox>
Style="{DynamicResource NestedTextBoxStyle}" />

<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<RepeatButton x:Name="PART_DecreaseButton"
Expand Down