more dialog focus shenanigans. fixes #235

Author: ButchersBoy

MainDemo.Wpf/Domain/SampleDialog.xaml

@@ -3,10 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:MaterialDesignColors.WpfExample.Domain"
              xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
-             xmlns:wpfExample="clr-namespace:MaterialDesignColors.WpfExample"
              xmlns:materialDesignDemo="clr-namespace:MaterialDesignDemo"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
@@ -51,7 +49,5 @@
                 CANCEL
             </Button>
         </StackPanel>
-        
-            
     </Grid>
 </UserControl>

MaterialDesignThemes.Wpf/DialogHost.cs

@@ -231,7 +231,6 @@ private static void IsOpenPropertyChangedCallback(DependencyObject dependencyObj
             ValidationAssist.SetSuppress(dialogHost._popupContentControl, !dialogHost.IsOpen);
             VisualStateManager.GoToState(dialogHost, dialogHost.SelectState(), !TransitionAssist.GetDisableTransitions(dialogHost));
 
-
             if (dialogHost.IsOpen)
             {
                 WatchWindowActivation(dialogHost);
@@ -578,16 +577,18 @@ private static void WatchWindowActivation(DialogHost dialogHost)
         }
 
         private void WindowOnDeactivated(object sender, EventArgs eventArgs)
-        {
-            _restoreFocus = _popupContentControl != null ? FocusManager.GetFocusedElement(_popupContentControl) : null;
+        {            
+            _restoreFocus = _popup != null ? FocusManager.GetFocusedElement((Window)sender) : null;
         }
 
         private void WindowOnActivated(object sender, EventArgs eventArgs)
         {
             if (_restoreFocus != null)
             {
-                Dispatcher.BeginInvoke(new Action(() => Keyboard.Focus(_restoreFocus)));
-
+                Dispatcher.BeginInvoke(new Action(() =>
+                {                    
+                    Keyboard.Focus(_restoreFocus);
+                }));
             }
         }
     }

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -584,7 +584,7 @@
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                         <controlzEx:PopupEx IsOpen="False"
-                                          PlacementTarget="{Binding ElementName=DialogHostRoot, Mode=OneWay}"
+                                          PlacementTarget="{Binding ElementName=DialogHostRoot, Mode=OneWay}"                                            
                                           StaysOpen="True"
                                           AllowsTransparency="True"
                                           PopupAnimation="None"
@@ -608,8 +608,6 @@
                                         TextOptions.TextRenderingMode="Auto"
                                         Foreground="{DynamicResource MaterialDesignBody}"
                                         FontFamily="{StaticResource MaterialDesignFont}"
-                                        FocusManager.IsFocusScope="True"
-                                        KeyboardNavigation.TabNavigation="Contained"
                                         IsTabStop="False"
                                         Opacity="0"
                                         RenderTransformOrigin=".5,.5"