Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 6 insertions, 2 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
index 5062df1d6..65337a892 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
@@ -143,9 +143,9 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Error",
                 Brush = Application.Current.Resources["TangoMessageBoxErrorBrush"] as Brush,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderErrorBrush"] as Brush,
             });
         }
-
         /// <summary>
         /// Shows an information message box.
         /// </summary>
@@ -159,6 +159,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Information",
                 Brush = Application.Current.Resources["TangoMessageBoxInfoBrush"] as Brush,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderInfoBrush"] as Brush,
             });
         }
 
@@ -175,6 +176,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Warning",
                 Brush = Application.Current.Resources["TangoMessageBoxWarningBrush"] as Brush,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderWarningBrush"] as Brush,
             });
         }
 
@@ -192,6 +194,7 @@ namespace Tango.PPC.UI.Notifications
                 Title = "Confirm",
                 HasCancel = true,
                 Brush = Application.Current.Resources["TangoMessageBoxQuestionBrush"] as Brush,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderQuestionBrush"] as Brush,
             });
         }
 
@@ -208,6 +211,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.Check,
                 Title = "Success",
                 Brush = Application.Current.Resources["TangoMessageBoxSuccessBrush"] as Brush,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderSuccessBrush"] as Brush,
             });
         }
 
@@ -388,7 +392,7 @@ namespace Tango.PPC.UI.Notifications
                 throw new NullReferenceException("The view " + viewType.ToString() + " is not of type framework element.");
             }
 
-            return ShowDialog<T>(datacontext, Activator.CreateInstance(viewType) as FrameworkElement);
+            return ShowDialog<T>(datacontext, view);
         }
 
         /// <summary>