From e00ec8726294ec04487a9cdb2fb2d5d979c68aba Mon Sep 17 00:00:00 2001
From: Alexander Georgiadis <freethetech101@gmail.com>
Date: Wed, 17 Aug 2022 10:49:35 -0400
Subject: [PATCH] Allow setting icons on buttons within dialogs

---
 src/Wpf.Ui.Demo/Views/Container.xaml   |  3 ++-
 src/Wpf.Ui/Controls/Dialog.cs          | 32 ++++++++++++++++++++++++++
 src/Wpf.Ui/Styles/Controls/Dialog.xaml |  2 ++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/Wpf.Ui.Demo/Views/Container.xaml b/src/Wpf.Ui.Demo/Views/Container.xaml
index 55ec6d9ea..e22c6d8c3 100644
--- a/src/Wpf.Ui.Demo/Views/Container.xaml
+++ b/src/Wpf.Ui.Demo/Views/Container.xaml
@@ -169,7 +169,8 @@
             Title="WPF UI"
             Grid.Row="0"
             Grid.RowSpan="2"
-            ButtonLeftName="Click me if you can!" />
+            ButtonLeftName="Click me if you can!"
+            ButtonLeftIcon="FoodCarrot24" />
 
         <!--
             For debugging the focus and the keyboard navigation,
diff --git a/src/Wpf.Ui/Controls/Dialog.cs b/src/Wpf.Ui/Controls/Dialog.cs
index d77c71855..d789bcb90 100644
--- a/src/Wpf.Ui/Controls/Dialog.cs
+++ b/src/Wpf.Ui/Controls/Dialog.cs
@@ -111,6 +111,13 @@ public class Dialog : System.Windows.Controls.ContentControl, IDialogControl
         typeof(Common.ControlAppearance), typeof(Dialog),
         new PropertyMetadata(Common.ControlAppearance.Primary));
 
+    /// <summary>
+    /// Property for <see cref="ButtonLeftIconProperty"/>.
+    /// </summary>
+    public static readonly DependencyProperty ButtonLeftIconProperty = DependencyProperty.Register(
+        nameof(ButtonLeftIcon),
+        typeof(SymbolRegular), typeof(Dialog));
+
     /// <summary>
     /// Property for <see cref="ButtonLeftVisibility"/>.
     /// </summary>
@@ -134,6 +141,13 @@ public class Dialog : System.Windows.Controls.ContentControl, IDialogControl
         typeof(Common.ControlAppearance), typeof(Dialog),
         new PropertyMetadata(Common.ControlAppearance.Secondary));
 
+    /// <summary>
+    /// Property for <see cref="ButtonRightAppearance"/>.
+    /// </summary>
+    public static readonly DependencyProperty ButtonRightIconProperty = DependencyProperty.Register(
+        nameof(ButtonRightIcon),
+        typeof(SymbolRegular), typeof(Dialog));
+
     /// <summary>
     /// Property for <see cref="ButtonRightVisibility"/>.
     /// </summary>
@@ -209,6 +223,15 @@ public Common.ControlAppearance ButtonLeftAppearance
         set => SetValue(ButtonLeftAppearanceProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets the <see cref="SymbolRegular"/> of the button on the left.
+    /// </summary>
+    public SymbolRegular ButtonLeftIcon
+    {
+        get => (SymbolRegular)GetValue(ButtonLeftIconProperty);
+        set => SetValue(ButtonLeftIconProperty, value);
+    }
+
     /// <summary>
     /// Gets or sets the visibility of the button on the left.
     /// </summary>
@@ -241,6 +264,15 @@ public Common.ControlAppearance ButtonRightAppearance
         set => SetValue(ButtonRightAppearanceProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets the <see cref="SymbolRegular"/> of the button on the right.
+    /// </summary>
+    public SymbolRegular ButtonRightIcon
+    {
+        get => (SymbolRegular)GetValue(ButtonRightIconProperty);
+        set => SetValue(ButtonRightIconProperty, value);
+    }
+
     /// <summary>
     /// Gets or sets the visibility of the button on the right.
     /// </summary>
diff --git a/src/Wpf.Ui/Styles/Controls/Dialog.xaml b/src/Wpf.Ui/Styles/Controls/Dialog.xaml
index df67ed0f5..52af0abb2 100644
--- a/src/Wpf.Ui/Styles/Controls/Dialog.xaml
+++ b/src/Wpf.Ui/Styles/Controls/Dialog.xaml
@@ -120,6 +120,7 @@
                                                 Margin="0,0,4,0"
                                                 HorizontalAlignment="Stretch"
                                                 Appearance="{TemplateBinding ButtonLeftAppearance}"
+                                                Icon="{TemplateBinding ButtonLeftIcon}"
                                                 Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                                 CommandParameter="left"
                                                 Content="{TemplateBinding ButtonLeftName}"
@@ -131,6 +132,7 @@
                                                 Margin="4,0,0,0"
                                                 HorizontalAlignment="Stretch"
                                                 Appearance="{TemplateBinding ButtonRightAppearance}"
+                                                Icon="{TemplateBinding ButtonRightIcon}"
                                                 Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                                 CommandParameter="right"
                                                 Content="{TemplateBinding ButtonRightName}"