Adaptations to the new resource names

timunie · Sep 2, 2019 · 49673aa · 49673aa
1 parent 628ac05
commit 49673aa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -268,12 +268,13 @@
             <CheckBox Margin="{StaticResource ControlMargin}" Content="_Enabled" />
             <CheckBox Margin="{StaticResource ControlMargin}"
                       Content="Enabled"
-                      IsChecked="True" />
+                      IsChecked="True"
+                      IsThreeState="True" />
             <CheckBox Margin="{StaticResource ControlMargin}"
                       Content="Enabled"
                       IsChecked="{x:Null}"
-                      IsThreeState="True" 
-                      Style="{StaticResource MahApps.Metro.Styles.CheckBox.Win10}"/>
+                      IsThreeState="True"
+                      Style="{StaticResource MahApps.Styles.CheckBox.Win10}"/>
             <CheckBox Margin="{StaticResource ControlMargin}"
                       Content="Disabled"
                       IsEnabled="False" />

diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -193,7 +193,7 @@
                     <Path Width="12"
                           Height="10"
                           Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"
-                          Fill="{DynamicResource HighlightBrush}"
+                          Fill="{DynamicResource MahApps.Brushes.Highlight}"
                           Stretch="Fill"
                           UseLayoutRounding="False" />
                 </DataTemplate>
@@ -204,21 +204,21 @@
                 <DataTemplate>
                     <Rectangle Width="8"
                                Height="3"
-                               Fill="{DynamicResource GrayBrush3}" />
+                               Fill="{DynamicResource MahApps.Brushes.Gray3}" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.CheckBox.Win10" TargetType="CheckBox" BasedOn="{StaticResource MetroCheckBox}" >
+    <Style x:Key="MahApps.Styles.CheckBox.Win10" TargetType="CheckBox" BasedOn="{StaticResource MahApps.Styles.CheckBox}" >
         <Setter Property="Controls:CheckBoxHelper.CheckBoxSize" Value="20" />
-        <Setter Property="Controls:CheckBoxHelper.CheckedBackgroundBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckedBorderBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Controls:CheckBoxHelper.CheckedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:CheckBoxHelper.CheckedBorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Controls:CheckBoxHelper.CheckedGlyphTemplate" >
             <Setter.Value>
                 <DataTemplate>
                     <Path StrokeThickness="2" 
-                          Stroke="{DynamicResource IdealForegroundColorBrush}" 
+                          Stroke="{DynamicResource MahApps.Brushes.IdealForeground}" 
                           StrokeLineJoin="Miter" 
                           StrokeStartLineCap="Flat" 
                           StrokeEndLineCap="Flat" 
@@ -235,7 +235,7 @@
             <Setter.Value>
                 <DataTemplate>
                     <Rectangle Margin="4"
-                               Fill="{DynamicResource GrayBrush3}" />
+                               Fill="{DynamicResource MahApps.Brushes.Gray3}" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>