Fix some mui style keys

Author: Evangelink

src/MahApps.Metro/Styles/Controls.ComboBox.xaml

@@ -987,7 +987,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ComboBox.DataGridEditing" TargetType="ComboBox" BasedOn="{StaticResource MahApps.Styles.ComboBox.Mui}">
+    <Style x:Key="MahApps.Styles.ComboBox.DataGridEditing.Mui" TargetType="ComboBox" BasedOn="{StaticResource MahApps.Styles.ComboBox.Mui}">
         <Setter Property="IsSynchronizedWithCurrentItem" Value="False" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Padding" Value="1,1" />

src/MahApps.Metro/Styles/Controls.DataGrid.xaml

@@ -627,7 +627,7 @@
 
     <!-- MUI -->
 
-    <Style x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type DataGrid}, ResourceId=DataGridSelectAllButtonStyle}" TargetType="{x:Type Button}"
+    <Style x:Key="MahApps.Styles.Button.DataGridSelectAll.Mui" TargetType="{x:Type Button}"
            BasedOn="{StaticResource MahApps.Styles.Button.Base.Mui}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />

src/MahApps.Metro/Styles/Controls.GridSpliter.xaml

@@ -1,6 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <!-- MUI -->
+
     <Style x:Key="MahApps.Styles.GridSplitter.Mui" TargetType="GridSplitter">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SeparatorBackground.Mui}" />
         <Setter Property="VerticalAlignment" Value="Stretch" />

src/MahApps.Metro/Styles/Controls.Hyperlink.xaml

@@ -1,8 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:MahApps.Metro.Styles">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-  <Style x:Key="MahApps.Styles.Hyperlink.Mui" TargetType="{x:Type Hyperlink}">
+    <!-- MUI -->
+
+    <Style x:Key="MahApps.Styles.Hyperlink.Mui" TargetType="{x:Type Hyperlink}">
     <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Hyperlink.Mui}"/>
     <Setter Property="TextDecorations" Value="Underline"/>
     <Style.Triggers>

src/MahApps.Metro/Styles/Controls.Label.xaml

@@ -5,6 +5,8 @@
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Label.Text}" />
     </Style>
 
+    <!-- MUI -->
+
     <Style x:Key="MahApps.Styles.Label.Mui" TargetType="{x:Type Label}">
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.WindowText.Mui}"/>
         <Setter Property="Background" Value="Transparent"/>

src/MahApps.Metro/Styles/Controls.ListView.xaml

@@ -449,7 +449,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static GridView.GridViewStyleKey}" TargetType="{x:Type ListView}">
+    <Style x:Key="MahApps.Styles.ListView.GridView.Mui" TargetType="{x:Type ListView}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>

src/MahApps.Metro/Styles/Controls.MenuItem.xaml

@@ -6,7 +6,7 @@
     <Geometry x:Key="RightArrow">M 0,0 L 4,3.5 L 0,7 Z</Geometry>
     <Geometry x:Key="Checkmark">M 15,21L 22,28L 32.9999,14.0001L 35.9999,17.0001L 22,34L 12.0001,24L 15,21 Z</Geometry>
 
-    <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}">
+    <Style x:Key="MahApps.Styles.Separator.MenuItem.Mui" TargetType="{x:Type Separator}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Separator}">
@@ -20,8 +20,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}"
-                     TargetType="{x:Type MenuItem}">
+    <ControlTemplate x:Key="MahApps.Templates.MenuItem.SubMenuItem.Mui" TargetType="{x:Type MenuItem}">
         <Grid SnapsToDevicePixels="true">
             <Rectangle Name="Bg" Fill="{TemplateBinding MenuItem.Background}"/>
             <Grid>
@@ -80,8 +79,8 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
-    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}"
-                     TargetType="{x:Type MenuItem}">
+
+    <ControlTemplate x:Key="MahApps.Templates.MenuItem.SubMenuHeader.Mui" TargetType="{x:Type MenuItem}">
         <Grid SnapsToDevicePixels="true">
             <Rectangle Name="Bg" Fill="{TemplateBinding MenuItem.Background}"/>
             <Grid>
@@ -181,6 +180,7 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
+
     <Style x:Key="MahApps.Styles.MenuItem.Mui" TargetType="{x:Type MenuItem}">
         <Setter Property="HorizontalContentAlignment"
                 Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>

src/MahApps.Metro/Styles/Controls.Scrollbars.xaml

@@ -521,7 +521,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static GridView.GridViewScrollViewerStyleKey}" TargetType="{x:Type ScrollViewer}">
+    <Style x:Key="MahApps.Styles.ScrollViewer.GridView.Mui" TargetType="{x:Type ScrollViewer}">
         <Setter Property="Focusable" Value="false"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Template">

src/MahApps.Metro/Styles/Controls.TextBlock.xaml

@@ -70,7 +70,7 @@
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.TextBlock.DataGrid" TargetType="TextBlock" >
+    <Style x:Key="MahApps.Styles.TextBlock.DataGrid.Mui" TargetType="TextBlock" >
         <Setter Property="Margin" Value="2,0" />
     </Style>
 

src/MahApps.Metro/Styles/Controls.TextBox.xaml

@@ -1086,8 +1086,6 @@
 
     <Style x:Key="MahApps.Styles.RichTextBox.Mui" BasedOn="{StaticResource MahApps.Styles.TextBoxBase.Mui}" TargetType="{x:Type RichTextBox}" />
 
-    <!-- text-in-datagrid styles-->
-
     <Style x:Key="MahApps.Styles.TextBox.DataGridEditing.Mui" TargetType="TextBox" BasedOn="{StaticResource MahApps.Styles.TextBox.Mui}">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Padding" Value="0" />