Merge branch 'UmutComlekci-master'

Enterwell · Oct 11, 2018 · 46c634f · 46c634f
2 parents 0ac533d + 402dab6
commit 46c634f
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.4.1] - 2018-10-11
+### Fixed
+- Fixed problem where message with animation would trigger dismiss event before disapearing 
+
 ## [1.4.0] - 2018-06-09
 ### Added
 - Added `WithAdditionalContent` feature

diff --git a/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs b/Enterwell.Clients.Wpf.Notifications/NotificationMessageBuilderLinq.cs
@@ -231,7 +231,28 @@ private static Action<INotificationMessage> DismissBefore(
         {
             return call =>
             {
-                builder.Manager.Dismiss(builder.Message);
+                if (builder.Message is INotificationAnimation animatableMessage)
+                {
+                    var animation = animatableMessage.AnimationOut;
+                    if (animation != null && 
+                        animatableMessage.Animates && 
+                        animatableMessage.AnimatableElement != null && 
+                        animatableMessage.AnimationOutDependencyProperty != null)
+                    {
+                        animation.Completed += (s, a) => 
+                        {
+                            builder.Manager.Dismiss(builder.Message);
+                        };
+                    }
+                    else
+                    {
+                        builder.Manager.Dismiss(builder.Message);
+                    }
+                }
+                else
+                {
+                    builder.Manager.Dismiss(builder.Message);
+                }
                 callback?.Invoke(builder.Message);
             };
         }
@@ -251,7 +272,28 @@ private static Action<INotificationMessageButton> DismissBefore(
         {
             return button =>
             {
-                builder.Manager.Dismiss(builder.Message);
+                if (builder.Message is INotificationAnimation animatableMessage)
+                {
+                    var animation = animatableMessage.AnimationOut;
+                    if (animation != null && 
+                        animatableMessage.Animates && 
+                        animatableMessage.AnimatableElement != null && 
+                        animatableMessage.AnimationOutDependencyProperty != null)
+                    {
+                        animation.Completed += (s, a) => 
+                        {
+                            builder.Manager.Dismiss(builder.Message);
+                        };
+                    }
+                    else
+                    {
+                        builder.Manager.Dismiss(builder.Message);
+                    }
+                }
+                else
+                {
+                    builder.Manager.Dismiss(builder.Message);
+                }
                 callback?.Invoke(button);
             };
         }

diff --git a/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs b/Enterwell.Clients.Wpf.Notifications/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]