From f514e2487b1ff8b14fd69202cdb3acea4786511b Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Mon, 4 May 2020 15:02:03 +0200
Subject: [PATCH 1/4] Added a way to use DataTemplate in BadgedControl

---
 .../ExampleViews/ButtonsExample.xaml          |  5 +++
 src/MahApps.Metro/Controls/Badged.cs          | 41 +++++++++++++++++++
 .../Converters/SizeToCornerRadiusConverter.cs | 40 ++++++++++++++++++
 src/MahApps.Metro/Themes/Badged.xaml          |  7 +++-
 4 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index 172288f23a..32c8b4f3df 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -45,6 +45,11 @@
             <Controls:Badged x:Name="CountingBadge"
                              Width="100"
                              Margin="{StaticResource ControlMargin}">
+                <Controls:Badged.BadgeTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding StringFormat='{}click-count: {0:00}'}" FontSize="12" />
+                    </DataTemplate>
+                </Controls:Badged.BadgeTemplate>
                 <Button Click="CountingButton_OnClick" Content="Click Me" />
             </Controls:Badged>
             <Button Width="100"
diff --git a/src/MahApps.Metro/Controls/Badged.cs b/src/MahApps.Metro/Controls/Badged.cs
index d739ee930a..0b8f5bab8d 100644
--- a/src/MahApps.Metro/Controls/Badged.cs
+++ b/src/MahApps.Metro/Controls/Badged.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Media.Animation;
 using ControlzEx;
 
@@ -15,6 +16,21 @@ public static readonly DependencyProperty BadgeChangedStoryboardProperty
                                           typeof(Badged),
                                           new PropertyMetadata(default(Storyboard)));
 
+        /// <summary>Identifies the <see cref="BadgeTemplate"/> dependency property.</summary>
+        public static readonly DependencyProperty BadgeTemplateProperty 
+            = DependencyProperty.Register(nameof(BadgeTemplate), 
+                                          typeof(DataTemplate), 
+                                          typeof(Badged), 
+                                          new PropertyMetadata(null));
+
+        /// <summary>Identifies the <see cref="BadgeTemplateSelector"/> dependency property.</summary>
+        public static readonly DependencyProperty BadgeTemplateSelectorProperty 
+            = DependencyProperty.Register(nameof(BadgeTemplateSelector), 
+                                          typeof(DataTemplateSelector), 
+                                          typeof(Badged),
+                                          new PropertyMetadata(null));
+
+
         public Storyboard BadgeChangedStoryboard
         {
             get => (Storyboard)this.GetValue(BadgeChangedStoryboardProperty);
@@ -50,5 +66,30 @@ private void OnBadgeChanged(object sender, RoutedPropertyChangedEventArgs<object
                 }
             }
         }
+
+
+
+        /// <summary>
+        /// Gets or Sets the <see cref="DataTemplate"/> for the Badge
+        /// </summary>
+        public DataTemplate BadgeTemplate
+        {
+            get { return (DataTemplate)GetValue(BadgeTemplateProperty); }
+            set { SetValue(BadgeTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or Sets the <see cref="DataTemplateSelector"/> for the Badge
+        /// </summary>
+        public DataTemplateSelector BadgeTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(BadgeTemplateSelectorProperty); }
+            set { SetValue(BadgeTemplateSelectorProperty, value); }
+        }
+
+        
+
+
+
     }
 }
\ No newline at end of file
diff --git a/src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs b/src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs
new file mode 100644
index 0000000000..0ac5ccc214
--- /dev/null
+++ b/src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace MahApps.Metro.Converters
+{
+    /// <summary>
+    /// This Converter converts a given height or width of an control to a CornerRadius
+    /// </summary>
+    public class SizeToCornerRadiusConverter : MarkupExtension, IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is double val)
+            {
+                return new CornerRadius(val / 2);
+            }
+            else
+            {
+                throw new ArgumentException("The value is not a valid double.");
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Binding.DoNothing;
+        }
+
+        public override object ProvideValue(IServiceProvider serviceProvider)
+        {
+            return this;
+        }
+    }
+}
diff --git a/src/MahApps.Metro/Themes/Badged.xaml b/src/MahApps.Metro/Themes/Badged.xaml
index a7cb6177bf..dcd58cfc83 100644
--- a/src/MahApps.Metro/Themes/Badged.xaml
+++ b/src/MahApps.Metro/Themes/Badged.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
                     xmlns:controls="clr-namespace:MahApps.Metro.Controls">
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -43,13 +44,13 @@
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <Border x:Name="PART_BadgeContainer"
-                                MinWidth="18"
+                                MinWidth="{Binding RelativeSource={RelativeSource Mode=Self}, Path=ActualHeight}"
                                 MinHeight="18"
                                 Padding="2"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Top"
                                 Background="{TemplateBinding BadgeBackground}"
-                                CornerRadius="9"
+                                CornerRadius="{Binding RelativeSource={RelativeSource Mode=Self}, Path=ActualHeight, Converter={converters:SizeToCornerRadiusConverter}}"
                                 RenderTransformOrigin=".5,.5"
                                 TextElement.FontSize="11"
                                 TextElement.FontWeight="DemiBold"
@@ -62,6 +63,8 @@
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             Content="{TemplateBinding Badge}"
+                                            ContentTemplate="{TemplateBinding BadgeTemplate}"
+                                            ContentTemplateSelector="{TemplateBinding BadgeTemplateSelector}"
                                             Focusable="False"
                                             Foreground="{TemplateBinding BadgeForeground}"
                                             IsTabStop="False" />

From c90cabf2390abab7748727555b92e30a4451a2fd Mon Sep 17 00:00:00 2001
From: timunie <47110241+timunie@users.noreply.github.com>
Date: Thu, 7 May 2020 10:45:05 +0200
Subject: [PATCH 2/4] Moved the Properties to ControlzEx

---
 src/MahApps.Metro/Controls/Badged.cs | 41 ----------------------------
 1 file changed, 41 deletions(-)

diff --git a/src/MahApps.Metro/Controls/Badged.cs b/src/MahApps.Metro/Controls/Badged.cs
index 0b8f5bab8d..d739ee930a 100644
--- a/src/MahApps.Metro/Controls/Badged.cs
+++ b/src/MahApps.Metro/Controls/Badged.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media.Animation;
 using ControlzEx;
 
@@ -16,21 +15,6 @@ public static readonly DependencyProperty BadgeChangedStoryboardProperty
                                           typeof(Badged),
                                           new PropertyMetadata(default(Storyboard)));
 
-        /// <summary>Identifies the <see cref="BadgeTemplate"/> dependency property.</summary>
-        public static readonly DependencyProperty BadgeTemplateProperty 
-            = DependencyProperty.Register(nameof(BadgeTemplate), 
-                                          typeof(DataTemplate), 
-                                          typeof(Badged), 
-                                          new PropertyMetadata(null));
-
-        /// <summary>Identifies the <see cref="BadgeTemplateSelector"/> dependency property.</summary>
-        public static readonly DependencyProperty BadgeTemplateSelectorProperty 
-            = DependencyProperty.Register(nameof(BadgeTemplateSelector), 
-                                          typeof(DataTemplateSelector), 
-                                          typeof(Badged),
-                                          new PropertyMetadata(null));
-
-
         public Storyboard BadgeChangedStoryboard
         {
             get => (Storyboard)this.GetValue(BadgeChangedStoryboardProperty);
@@ -66,30 +50,5 @@ private void OnBadgeChanged(object sender, RoutedPropertyChangedEventArgs<object
                 }
             }
         }
-
-
-
-        /// <summary>
-        /// Gets or Sets the <see cref="DataTemplate"/> for the Badge
-        /// </summary>
-        public DataTemplate BadgeTemplate
-        {
-            get { return (DataTemplate)GetValue(BadgeTemplateProperty); }
-            set { SetValue(BadgeTemplateProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or Sets the <see cref="DataTemplateSelector"/> for the Badge
-        /// </summary>
-        public DataTemplateSelector BadgeTemplateSelector
-        {
-            get { return (DataTemplateSelector)GetValue(BadgeTemplateSelectorProperty); }
-            set { SetValue(BadgeTemplateSelectorProperty, value); }
-        }
-
-        
-
-
-
     }
 }
\ No newline at end of file

From 58693b3c45da7e519da18e1a03e7231cbd0a89e6 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 9 May 2020 16:58:23 +0200
Subject: [PATCH 3/4] (GH-3789) Update style to latest ControlzEx version

---
 .../ExampleViews/ButtonsExample.xaml              |  4 +++-
 src/MahApps.Metro/Themes/Badged.xaml              | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 4 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
index 32c8b4f3df..3831b634f0 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -43,11 +43,13 @@
                 <Button Content="Print" />
             </Controls:Badged>
             <Controls:Badged x:Name="CountingBadge"
+                             BadgeFontSize="12"
+                             BadgeMargin="4 0"
                              Width="100"
                              Margin="{StaticResource ControlMargin}">
                 <Controls:Badged.BadgeTemplate>
                     <DataTemplate>
-                        <TextBlock Text="{Binding StringFormat='{}click-count: {0:00}'}" FontSize="12" />
+                        <TextBlock Text="{Binding StringFormat='{}Click-count: {0:00}'}" />
                     </DataTemplate>
                 </Controls:Badged.BadgeTemplate>
                 <Button Click="CountingButton_OnClick" Content="Click Me" />
diff --git a/src/MahApps.Metro/Themes/Badged.xaml b/src/MahApps.Metro/Themes/Badged.xaml
index dcd58cfc83..9db533206f 100644
--- a/src/MahApps.Metro/Themes/Badged.xaml
+++ b/src/MahApps.Metro/Themes/Badged.xaml
@@ -23,7 +23,10 @@
     <Style TargetType="{x:Type controls:Badged}">
         <Setter Property="BadgeBackground" Value="{DynamicResource MahApps.Brushes.Badged.Background}" />
         <Setter Property="BadgeChangedStoryboard" Value="{StaticResource BadgeChangedStoryboard}" />
+        <Setter Property="BadgeFontSize" Value="11" />
+        <Setter Property="BadgeFontWeight" Value="DemiBold" />
         <Setter Property="BadgeForeground" Value="{DynamicResource MahApps.Brushes.Badged.Foreground}" />
+        <Setter Property="BadgeMargin" Value="1 0" />
         <Setter Property="BadgePlacementMode" Value="TopRight" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
@@ -50,22 +53,28 @@
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Top"
                                 Background="{TemplateBinding BadgeBackground}"
+                                BorderBrush="{TemplateBinding BadgeBorderBrush}"
+                                BorderThickness="{TemplateBinding BadgeBorderThickness}"
                                 CornerRadius="{Binding RelativeSource={RelativeSource Mode=Self}, Path=ActualHeight, Converter={converters:SizeToCornerRadiusConverter}}"
                                 RenderTransformOrigin=".5,.5"
-                                TextElement.FontSize="11"
-                                TextElement.FontWeight="DemiBold"
                                 Visibility="{TemplateBinding IsBadgeSet, Converter={StaticResource BooleanToVisibilityConverter}}">
                             <Border.RenderTransform>
                                 <ScaleTransform ScaleX="1" ScaleY="1" />
                             </Border.RenderTransform>
                             <ContentControl x:Name="PART_BadgeContent"
-                                            Margin="1 0 1 0"
+                                            Margin="{TemplateBinding BadgeMargin}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             Content="{TemplateBinding Badge}"
+                                            ContentStringFormat="{TemplateBinding BadgeStringFormat}"
                                             ContentTemplate="{TemplateBinding BadgeTemplate}"
                                             ContentTemplateSelector="{TemplateBinding BadgeTemplateSelector}"
                                             Focusable="False"
+                                            FontFamily="{TemplateBinding BadgeFontFamily}"
+                                            FontSize="{TemplateBinding BadgeFontSize}"
+                                            FontStretch="{TemplateBinding BadgeFontStretch}"
+                                            FontStyle="{TemplateBinding BadgeFontStyle}"
+                                            FontWeight="{TemplateBinding BadgeFontWeight}"
                                             Foreground="{TemplateBinding BadgeForeground}"
                                             IsTabStop="False" />
                         </Border>

From c79c073be94641c57f440306ac0e4d565b8b4054 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 9 May 2020 17:18:50 +0200
Subject: [PATCH 4/4] (GH-3789) Derive SizeToCornerRadiusConverter from
 MarkupConverter

---
 .../Converters/SizeToCornerRadiusConverter.cs | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs b/src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs
index 0ac5ccc214..acbe9ced51 100644
--- a/src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs
+++ b/src/MahApps.Metro/Converters/SizeToCornerRadiusConverter.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
@@ -13,21 +9,16 @@ namespace MahApps.Metro.Converters
     /// <summary>
     /// This Converter converts a given height or width of an control to a CornerRadius
     /// </summary>
-    public class SizeToCornerRadiusConverter : MarkupExtension, IValueConverter
+    [ValueConversion(typeof(double), typeof(CornerRadius))]
+    [MarkupExtensionReturnType(typeof(SizeToCornerRadiusConverter))]
+    public class SizeToCornerRadiusConverter : MarkupConverter
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        protected override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is double val)
-            {
-                return new CornerRadius(val / 2);
-            }
-            else
-            {
-                throw new ArgumentException("The value is not a valid double.");
-            }
+            return value is double val ? new CornerRadius(val / 2) : new CornerRadius();
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        protected override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             return Binding.DoNothing;
         }
@@ -37,4 +28,4 @@ public override object ProvideValue(IServiceProvider serviceProvider)
             return this;
         }
     }
-}
+}
\ No newline at end of file