Merge pull request #1992 from PrismLibrary/Issue-1982

DialogService.cs methods made virtual
PrismLibrary · Jan 7, 2020 · d19dfb2 · d19dfb2
2 parents 568699b + bbf626b
commit d19dfb2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Source/Wpf/Prism.Wpf/Services/Dialogs/DialogService.cs b/Source/Wpf/Prism.Wpf/Services/Dialogs/DialogService.cs
@@ -48,15 +48,15 @@ void ShowDialogInternal(string name, IDialogParameters parameters, Action<IDialo
                 dialogWindow.Show();
         }
 
-        IDialogWindow CreateDialogWindow(string name)
+        protected virtual IDialogWindow CreateDialogWindow(string name)
         {
             if (string.IsNullOrWhiteSpace(name))
                 return _containerExtension.Resolve<IDialogWindow>();
             else
                 return _containerExtension.Resolve<IDialogWindow>(name);
         }
 
-        void ConfigureDialogWindowContent(string dialogName, IDialogWindow window, IDialogParameters parameters)
+        protected virtual void ConfigureDialogWindowContent(string dialogName, IDialogWindow window, IDialogParameters parameters)
         {
             var content = _containerExtension.Resolve<object>(dialogName);
             var dialogContent = content as FrameworkElement;
@@ -72,7 +72,7 @@ void ConfigureDialogWindowContent(string dialogName, IDialogWindow window, IDial
             MvvmHelpers.ViewAndViewModelAction<IDialogAware>(viewModel, d => d.OnDialogOpened(parameters));
         }
 
-        void ConfigureDialogWindowEvents(IDialogWindow dialogWindow, Action<IDialogResult> callback)
+        protected virtual void ConfigureDialogWindowEvents(IDialogWindow dialogWindow, Action<IDialogResult> callback)
         {
             Action<IDialogResult> requestCloseHandler = null;
             requestCloseHandler = (o) =>
@@ -117,7 +117,7 @@ void ConfigureDialogWindowEvents(IDialogWindow dialogWindow, Action<IDialogResul
             dialogWindow.Closed += closedHandler;
         }
 
-        void ConfigureDialogWindowProperties(IDialogWindow window, FrameworkElement dialogContent, IDialogAware viewModel)
+        protected virtual void ConfigureDialogWindowProperties(IDialogWindow window, FrameworkElement dialogContent, IDialogAware viewModel)
         {
             var windowStyle = Dialog.GetWindowStyle(dialogContent);
             if (windowStyle != null)
@@ -127,7 +127,7 @@ void ConfigureDialogWindowProperties(IDialogWindow window, FrameworkElement dial
             window.DataContext = viewModel; //we want the host window and the dialog to share the same data contex
 
             if (window.Owner == null)
-                window.Owner = Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive);
+                window.Owner = Application.Current?.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive);
         }
     }
 }