Fix Badged namespace (maybe I was still drunk)

MahApps · Feb 26, 2017 · da20732 · da20732
1 parent fc29fff
commit da20732
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/...tro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/ButtonsExample.xaml b/...tro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/ButtonsExample.xaml
@@ -6,7 +6,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MahApps.Metro"
              mc:Ignorable="d"
              d:DesignHeight="737.288"
              d:DesignWidth="800"
@@ -31,17 +30,17 @@
 
         <StackPanel Grid.Column="0">
             <Label Content="Default button" Style="{DynamicResource DescriptionHeaderStyle}" />
-            <wpf:Badged Width="100"
-                        Margin="{StaticResource ControlMargin}"
-                        Badge="3">
+            <Controls:Badged Width="100"
+                             Margin="{StaticResource ControlMargin}"
+                             Badge="3">
                 <Button Content="Mail" />
-            </wpf:Badged>
-            <wpf:Badged x:Name="CountingBadge"
-                        Width="100"
-                        Margin="{StaticResource ControlMargin}">
+            </Controls:Badged>
+            <Controls:Badged x:Name="CountingBadge"
+                             Width="100"
+                             Margin="{StaticResource ControlMargin}">
                 <Button Content="Click Me"
                         Click="CountingButton_OnClick" />
-            </wpf:Badged>
+            </Controls:Badged>
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Enabled" />

diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/Badged.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/Badged.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using ControlzEx;
 
-namespace MaterialDesignThemes.Wpf
+namespace MahApps.Metro.Controls
 {
     [TemplatePart(Name = BadgeContainerPartName, Type = typeof(UIElement))]
     public class Badged : BadgedEx

diff --git a/src/MahApps.Metro/MahApps.Metro/Themes/Badged.xaml b/src/MahApps.Metro/MahApps.Metro/Themes/Badged.xaml
@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
+                    xmlns:controls="clr-namespace:MahApps.Metro.Controls">
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     <SineEase x:Key="BadgeEase" EasingMode="EaseOut" />
 
-    <Style TargetType="{x:Type wpf:Badged}">
+    <Style TargetType="{x:Type controls:Badged}">
         <Setter Property="BadgeBackground" Value="{DynamicResource AccentBaseColorBrush}" />
         <Setter Property="BadgeForeground" Value="{DynamicResource IdealForegroundColorBrush}" />
         <Setter Property="BadgePlacementMode" Value="TopRight" />
@@ -14,7 +14,7 @@
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type wpf:Badged}">
+                <ControlTemplate TargetType="{x:Type controls:Badged}">
                     <Grid>
                         <Border Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"