Skip to content

Commit c603146

Browse files
authored
Added outline style for MahApp NumericUpDown and added to demo. fixes #2448 (#2466)
1 parent e160e5d commit c603146

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

MahMaterialDragablzMashUp/Mah.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@
6666
<smtx:XamlDisplay UniqueKey="NumericUpDown_2">
6767
<controls:NumericUpDown Culture="ar-EG" FlowDirection="RightToLeft" Margin="5" controls:TextBoxHelper.SelectAllOnFocus="True"/>
6868
</smtx:XamlDisplay>
69+
<smtx:XamlDisplay UniqueKey="NumericUpDown_3">
70+
<controls:NumericUpDown Style="{StaticResource MaterialDesignOutlinedNumericUpDown}"/>
71+
</smtx:XamlDisplay>
6972
</StackPanel>
7073
</TabItem>
7174
<TabItem Header="DataGrid">

MaterialDesignThemes.MahApps/Themes/MaterialDesignTheme.MahApps.NumericUpDown.xaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,15 @@
257257
<Setter TargetName="PART_NumericDown" Property="Visibility" Value="Collapsed" />
258258
<Setter TargetName="PART_NumericUp" Property="Visibility" Value="Collapsed" />
259259
</Trigger>
260+
<MultiTrigger>
261+
<MultiTrigger.Conditions>
262+
<Condition Property="IsKeyboardFocusWithin" Value="True" />
263+
<Condition Property="mah:ControlsHelper.FocusBorderThickness" Value="1" />
264+
<Condition Property="mah:ControlsHelper.CornerRadius" Value="4" />
265+
</MultiTrigger.Conditions>
266+
<Setter TargetName="Base" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderThickness)}" />
267+
<Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
268+
</MultiTrigger>
260269
</ControlTemplate.Triggers>
261270
</ControlTemplate>
262271
</Setter.Value>
@@ -265,4 +274,13 @@
265274
<Setter Property="UpDownButtonsWidth" Value="22" />
266275
<Setter Property="Validation.ErrorTemplate" Value="{StaticResource MaterialDesignValidationErrorTemplate}" />
267276
</Style>
277+
278+
<Style TargetType="{x:Type mah:NumericUpDown}" x:Key="MaterialDesignOutlinedNumericUpDown" BasedOn="{StaticResource MaterialDesignNumericUpDown}">
279+
<Setter Property="mah:ControlsHelper.CornerRadius" Value="4" />
280+
<Setter Property="mah:ControlsHelper.FocusBorderThickness" Value="1" />
281+
<Setter Property="Padding" Value="16" />
282+
<Setter Property="BorderThickness" Value="1" />
283+
<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaBorder}" />
284+
</Style>
285+
268286
</ResourceDictionary>

0 commit comments

Comments
 (0)