allow dialog content to be updated

Author: ButchersBoy

MaterialDesignThemes.Wpf/Converters/BrushRoundConverter.cs

@@ -13,11 +13,10 @@ public class BrushRoundConverter : IValueConverter
         public Brush LowValue { get; set; } = Brushes.Black;
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
+        {            
             var solidColorBrush = value as SolidColorBrush;
             if (solidColorBrush == null) return Binding.DoNothing;
 
-
             var color = solidColorBrush.Color;
 
             var brightness = 0.3 * color.R + 0.59 * color.G + 0.11 * color.B;

MaterialDesignThemes.Wpf/DialogHost.cs

@@ -32,8 +32,7 @@ public class DialogHost : ContentControl
 
         private Popup _popup;
         private Window _window;
-        private DialogClosingEventHandler _attachedDialogClosingEventHandler;
-        private bool _removeContentOnClose;
+        private DialogClosingEventHandler _attachedDialogClosingEventHandler;        
         private object _closeDialogExecutionParameter = null;
 
         static DialogHost()
@@ -85,7 +84,6 @@ public static async Task<object> Show(object content, object dialogIndetifier, D
 
             await task;
 
-            targets[0].DialogContent = null;
             targets[0]._asyncShowClosingEventHandler = null;
 
             return targets[0]._closeDialogExecutionParameter;
@@ -126,11 +124,6 @@ private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObj
             {
                 dialogHost._asyncShowWaitHandle.Set();
                 dialogHost._attachedDialogClosingEventHandler = null;
-                if (dialogHost._removeContentOnClose)
-                {
-                    dialogHost.DialogContent = null;
-                    dialogHost._removeContentOnClose = false;
-                }
                 return;
             }
 
@@ -257,7 +250,6 @@ private void OpenDialogHandler(object sender, ExecutedRoutedEventArgs executedRo
             {
                 AssertTargetableContent();
                 DialogContent = executedRoutedEventArgs.Parameter;
-                _removeContentOnClose = true;
             }
 
             SetCurrentValue(IsOpenProperty, true);
@@ -268,9 +260,9 @@ private void OpenDialogHandler(object sender, ExecutedRoutedEventArgs executedRo
         private void AssertTargetableContent()
         {
             var existindBinding = BindingOperations.GetBindingExpression(this, DialogContentProperty);
-            if (existindBinding != null || DialogContent != null)
+            if (existindBinding != null)
                 throw new InvalidOperationException(
-                    "Content cannot be passed to a dialog via the OpenDialog of DialogContent is already set, or has a binding.");
+                    "Content cannot be passed to a dialog via the OpenDialog if DialogContent already has a binding.");
         }
 
         private void CloseDialogHandler(object sender, ExecutedRoutedEventArgs executedRoutedEventArgs)

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -484,7 +484,7 @@
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="CardScaleTransform" Storyboard.TargetProperty="ScaleX">
                                                 <EasingDoubleKeyFrame Value="1" KeyTime="0" />
                                                 <EasingDoubleKeyFrame Value="1" KeyTime="0:0:0.18" />
-                                                <EasingDoubleKeyFrame Value="0" KeyTime="0:0:0.3">
+                                                <EasingDoubleKeyFrame Value="0.5" KeyTime="0:0:0.3">
                                                     <EasingDoubleKeyFrame.EasingFunction>
                                                         <SineEase EasingMode="EaseInOut" />
                                                     </EasingDoubleKeyFrame.EasingFunction>
@@ -493,7 +493,7 @@
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="CardScaleTransform" Storyboard.TargetProperty="ScaleY">
                                                 <EasingDoubleKeyFrame Value="1" KeyTime="0" />
                                                 <EasingDoubleKeyFrame Value="1" KeyTime="0:0:0.18" />
-                                                <EasingDoubleKeyFrame Value="0" KeyTime="0:0:0.3">
+                                                <EasingDoubleKeyFrame Value="0.5" KeyTime="0:0:0.3">
                                                     <EasingDoubleKeyFrame.EasingFunction>
                                                         <SineEase EasingMode="EaseInOut" />
                                                     </EasingDoubleKeyFrame.EasingFunction>
@@ -519,12 +519,15 @@
                                 </VisualState>
                                 <VisualState x:Name="Closed">
                                     <Storyboard>
-                                        
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="IsOpen">
+                                            <DiscreteBooleanKeyFrame Value="True" KeyTime="0:0:0" />
+                                            <DiscreteBooleanKeyFrame Value="False" KeyTime="0:0:0.3" />
+                                        </BooleanAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Popup IsOpen="False" StaysOpen="True" AllowsTransparency="True"
+                        <Popup IsOpen="False" StaysOpen="True" AllowsTransparency="True" PopupAnimation="None"
                                x:Name="PART_Popup"
                                Placement="Center">
                             <Popup.Resources>