Skip to content

Commit

Permalink
(GH-3840) Fix DataGrid style key names for NumericUpDown
Browse files Browse the repository at this point in the history
- Fix style key `MahApps.Styles.NumericUpDown.DataGridColumn` to `MahApps.Styles.NumericUpDown.DataGrid`
- Fix style key `MahApps.Styles.NumericUpDown.DataGridColumnEditing` to `MahApps.Styles.NumericUpDown.DataGrid.Editing`
  • Loading branch information
punker76 committed Jun 9, 2020
1 parent 946c93a commit 8aabe07
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/MahApps.Metro/Styles/Controls.DataGrid.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<Setter Property="mah:TextBoxHelper.ClearTextButton" Value="True" />
</Style>

<Style x:Key="MahApps.Styles.NumericUpDown.DataGridColumn"
<Style x:Key="MahApps.Styles.NumericUpDown.DataGrid"
BasedOn="{StaticResource {x:Type mah:NumericUpDown}}"
TargetType="{x:Type mah:NumericUpDown}">
<Setter Property="Background" Value="Transparent" />
Expand All @@ -135,8 +135,8 @@
<Setter Property="mah:ControlsHelper.CornerRadius" Value="0" />
</Style>

<Style x:Key="MahApps.Styles.NumericUpDown.DataGridColumnEditing"
BasedOn="{StaticResource MahApps.Styles.NumericUpDown.DataGridColumn}"
<Style x:Key="MahApps.Styles.NumericUpDown.DataGrid.Editing"
BasedOn="{StaticResource MahApps.Styles.NumericUpDown.DataGrid}"
TargetType="{x:Type mah:NumericUpDown}">
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
<Setter Property="HideUpDownButtons" Value="False" />
Expand Down Expand Up @@ -738,8 +738,8 @@
<Setter Property="mah:DataGridHelper.AutoGeneratedCheckBoxColumnStyle" Value="{StaticResource MahApps.Styles.CheckBox.DataGrid}" />
<Setter Property="mah:DataGridHelper.AutoGeneratedComboBoxColumnEditingStyle" Value="{StaticResource MahApps.Styles.ComboBox.DataGrid.Editing}" />
<Setter Property="mah:DataGridHelper.AutoGeneratedComboBoxColumnStyle" Value="{StaticResource MahApps.Styles.ComboBox.DataGrid}" />
<Setter Property="mah:DataGridHelper.AutoGeneratedNumericUpDownColumnEditingStyle" Value="{StaticResource MahApps.Styles.NumericUpDown.DataGridColumnEditing}" />
<Setter Property="mah:DataGridHelper.AutoGeneratedNumericUpDownColumnStyle" Value="{StaticResource MahApps.Styles.NumericUpDown.DataGridColumn}" />
<Setter Property="mah:DataGridHelper.AutoGeneratedNumericUpDownColumnEditingStyle" Value="{StaticResource MahApps.Styles.NumericUpDown.DataGrid.Editing}" />
<Setter Property="mah:DataGridHelper.AutoGeneratedNumericUpDownColumnStyle" Value="{StaticResource MahApps.Styles.NumericUpDown.DataGrid}" />
<Setter Property="mah:DataGridHelper.AutoGeneratedTextColumnEditingStyle" Value="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing}" />
<Setter Property="mah:DataGridHelper.AutoGeneratedTextColumnStyle" Value="{StaticResource MahApps.Styles.TextBlock.DataGrid}" />
<Setter Property="mah:DataGridHelper.ColumnStylesHelper" Value="{mah:DataGridColumnStylesHelper}" />
Expand Down

0 comments on commit 8aabe07

Please sign in to comment.