Merge pull request #22 from ButchersBoy/master

update from original repo

Author: spiegelp

MaterialDesignThemes.Wpf/DialogHost.cs

@@ -69,7 +69,8 @@ public class DialogHost : ContentControl
         private DialogOpenedEventHandler _attachedDialogOpenedEventHandler;
         private DialogClosingEventHandler _attachedDialogClosingEventHandler;        
         private object _closeDialogExecutionParameter;
-        private IInputElement _restoreFocus;
+        private IInputElement _restoreFocusDialogClose;        
+        private IInputElement _restoreFocusWindowReactivation;
         private Action _currentSnackbarMessageQueueUnPauseAction = null;
         private Action _closeCleanUp = () => { };
 
@@ -237,8 +238,8 @@ public object Identifier
 
         private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            var dialogHost = (DialogHost)dependencyObject;
-            
+            var dialogHost = (DialogHost)dependencyObject;            
+
             if (dialogHost._popupContentControl != null)
                 ValidationAssist.SetSuppress(dialogHost._popupContentControl, !dialogHost.IsOpen);
             VisualStateManager.GoToState(dialogHost, dialogHost.SelectState(), !TransitionAssist.GetDisableTransitions(dialogHost));
@@ -260,12 +261,15 @@ private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObj
                 dialogHost._session.IsEnded = true;
                 dialogHost._session = null;
                 dialogHost._closeCleanUp();
-                
+                dialogHost.Dispatcher.InvokeAsync(() => dialogHost._restoreFocusDialogClose.Focus(), DispatcherPriority.Input);
+
                 return;
             }
 
             dialogHost._asyncShowWaitHandle.Reset();
             dialogHost._session = new DialogSession(dialogHost);
+            var window = Window.GetWindow(dialogHost);
+            dialogHost._restoreFocusDialogClose = window != null ? FocusManager.GetFocusedElement(window) : null;
 
             //multiple ways of calling back that the dialog has opened:
             // * routed event
@@ -507,7 +511,7 @@ public static DialogClosingEventHandler GetDialogClosingAttached(DependencyObjec
         }        
 
         public static readonly DependencyProperty DialogClosingCallbackProperty = DependencyProperty.Register(
-            nameof(DialogClosingCallback), typeof (DialogClosingEventHandler), typeof (DialogHost), new PropertyMetadata(default(DialogClosingEventHandler)));
+            nameof(DialogClosingCallback), typeof (DialogClosingEventHandler), typeof (DialogHost), new PropertyMetadata(default(DialogClosingEventHandler)));        
 
         /// <summary>
         /// Callback fired when the <see cref="DialogClosing"/> event is fired, allowing the event to be processed from a binding/view model.
@@ -678,16 +682,16 @@ private static void WatchWindowActivation(DialogHost dialogHost)
 
         private void WindowOnDeactivated(object sender, EventArgs eventArgs)
         {            
-            _restoreFocus = _popup != null ? FocusManager.GetFocusedElement((Window)sender) : null;
+            _restoreFocusWindowReactivation = _popup != null ? FocusManager.GetFocusedElement((Window)sender) : null;
         }
 
         private void WindowOnActivated(object sender, EventArgs eventArgs)
         {
-            if (_restoreFocus != null)
+            if (_restoreFocusWindowReactivation != null)
             {
                 Dispatcher.BeginInvoke(new Action(() =>
                 {                    
-                    Keyboard.Focus(_restoreFocus);
+                    Keyboard.Focus(_restoreFocusWindowReactivation);
                 }));
             }
         }

MaterialDesignThemes.Wpf/Snackbar.cs

@@ -17,9 +17,12 @@ namespace MaterialDesignThemes.Wpf
     /// <summary>
     /// Implements a <see cref="Snackbar"/> inspired by the Material Design specs (https://material.google.com/components/snackbars-toasts.html).
     /// </summary>
-    [ContentProperty("Message")]
+    [ContentProperty(nameof(Message))]
     public class Snackbar : Control
     {
+        private const string ActivateStoryboardName = "ActivateStoryboard";
+        private const string DeactivateStoryboardName = "DeactivateStoryboard";
+
         private Action _messageQueueRegistrationCleanUp = null;
 
         static Snackbar()
@@ -28,7 +31,7 @@ static Snackbar()
         }
 
         public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
-            "Message", typeof(SnackbarMessage), typeof(Snackbar), new PropertyMetadata(default(SnackbarMessage)));
+            nameof(Message), typeof(SnackbarMessage), typeof(Snackbar), new PropertyMetadata(default(SnackbarMessage)));
 
         public SnackbarMessage Message
         {
@@ -37,7 +40,7 @@ public SnackbarMessage Message
         }
 
         public static readonly DependencyProperty MessageQueueProperty = DependencyProperty.Register(
-            "MessageQueue", typeof(SnackbarMessageQueue), typeof(Snackbar), new PropertyMetadata(default(SnackbarMessageQueue), MessageQueuePropertyChangedCallback));
+            nameof(MessageQueue), typeof(SnackbarMessageQueue), typeof(Snackbar), new PropertyMetadata(default(SnackbarMessageQueue), MessageQueuePropertyChangedCallback));
 
         private static void MessageQueuePropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
@@ -54,7 +57,7 @@ public SnackbarMessageQueue MessageQueue
         }
 
         public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register(
-            "IsActive", typeof(bool), typeof(Snackbar), new PropertyMetadata(default(bool), IsActivePropertyChangedCallback));
+            nameof(IsActive), typeof(bool), typeof(Snackbar), new PropertyMetadata(default(bool), IsActivePropertyChangedCallback));
 
         public bool IsActive
         {
@@ -70,7 +73,7 @@ public event RoutedPropertyChangedEventHandler<bool> IsActiveChanged
 
         public static readonly RoutedEvent IsActiveChangedEvent =
             EventManager.RegisterRoutedEvent(
-                "IsActiveChanged",
+                nameof(IsActiveChanged),
                 RoutingStrategy.Bubble,
                 typeof(RoutedPropertyChangedEventHandler<bool>),
                 typeof(Snackbar));
@@ -87,7 +90,7 @@ private static void OnIsActiveChanged(
 
         public static readonly RoutedEvent DeactivateStoryboardCompletedEvent =
             EventManager.RegisterRoutedEvent(
-                "DeactivateStoryboardCompleted",
+                nameof(DeactivateStoryboardCompleted),
                 RoutingStrategy.Bubble,
                 typeof(SnackbarMessageEventArgs),
                 typeof(Snackbar));
@@ -110,7 +113,7 @@ private static void OnDeactivateStoryboardCompleted(
         public TimeSpan DeactivateStoryboardDuration { get; private set; }
 
         public static readonly DependencyProperty ActionButtonStyleProperty = DependencyProperty.Register(
-            "ActionButtonStyle", typeof(Style), typeof(Snackbar), new PropertyMetadata(default(Style)));
+            nameof(ActionButtonStyle), typeof(Style), typeof(Snackbar), new PropertyMetadata(default(Style)));
 
         public Style ActionButtonStyle
         {
@@ -129,8 +132,8 @@ public override void OnApplyTemplate()
             //(currently we have no even on the activate animation; don't 
             // need it just now, but it would mirror the deactivate)
 
-            ActivateStoryboardDuration = GetStoryboardResourceDuration("ActivateStoryboard");
-            DeactivateStoryboardDuration = GetStoryboardResourceDuration("DeactivateStoryboard");
+            ActivateStoryboardDuration = GetStoryboardResourceDuration(ActivateStoryboardName);
+            DeactivateStoryboardDuration = GetStoryboardResourceDuration(DeactivateStoryboardName);
 
             base.OnApplyTemplate();
         }        

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml

@@ -60,6 +60,9 @@
                         <Trigger Property="IsMouseOver" Value="true">
                             <Setter TargetName="border" Property="wpf:ShadowAssist.Darken" Value="True" />
                         </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="true">
+                            <Setter TargetName="border" Property="wpf:ShadowAssist.Darken" Value="True" />
+                        </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter Property="Opacity" Value="0.23"/>
                         </Trigger>
@@ -205,6 +208,9 @@
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="border" Property="wpf:ShadowAssist.Darken" Value="True" />
                         </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="true">
+                            <Setter TargetName="border" Property="wpf:ShadowAssist.Darken" Value="True" />
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Snackbar.xaml

@@ -84,6 +84,7 @@
                                     <TextBlock Text="{Binding}">
                                         <TextBlock.Style>
                                             <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MaterialDesignBody1TextBlock}">
+                                                <Setter Property="FontSize" Value="14" />
                                                 <Setter Property="TextWrapping" Value="WrapWithOverflow" />
                                                 <Setter Property="TextTrimming" Value="CharacterEllipsis" />
                                             </Style>
@@ -133,6 +134,12 @@
                                     <SineEase EasingMode="EaseOut" />
                                 </DoubleAnimation.EasingFunction>
                             </DoubleAnimation>
+                            <DoubleAnimation Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Opacity" To="0" BeginTime="0" Duration="0" />
+                            <DoubleAnimation Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Opacity" From="0" To="1" BeginTime="0:0:0.075" Duration="0:0:0.225">
+                                <DoubleAnimation.EasingFunction>
+                                    <SineEase EasingMode="EaseOut" />
+                                </DoubleAnimation.EasingFunction>
+                            </DoubleAnimation>
                         </Storyboard>
                         <Storyboard x:Key="DeactivateStoryboard" Duration="0:0:0.3">
                             <DoubleAnimation Storyboard.TargetName="Root" Storyboard.TargetProperty="Tag" From="1" To="0" Duration="0:0:0.3">