changes from: Pr/1467 Get the dialog from a MetroWindow #1739

i don't know why this pr doesn't works
MahApps · Jan 8, 2015 · 55c1de1 · 55c1de1
1 parent 4a632d2
commit 55c1de1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/MahApps.Metro/Controls/Dialogs/DialogManager.cs b/MahApps.Metro/Controls/Dialogs/DialogManager.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -355,6 +356,22 @@ public static Task HideMetroDialogAsync(this MetroWindow window, BaseMetroDialog
             }).Unwrap();
         }
 
+        /// <summary>
+        /// Gets the current shown dialog.
+        /// </summary>
+        /// <param name="window">The dialog owner.</param>
+        public static Task<TDialog> GetCurrentDialogAsync<TDialog>(this MetroWindow window) where TDialog : BaseMetroDialog
+        {
+            window.Dispatcher.VerifyAccess();
+            var t = new TaskCompletionSource<TDialog>();
+            window.Dispatcher.Invoke((Action)(() =>
+            {
+                TDialog dialog = window.metroDialogContainer.Children.OfType<TDialog>().LastOrDefault();
+                t.TrySetResult(dialog);
+            }));
+            return t.Task;
+        }
+
         private static SizeChangedEventHandler SetupAndOpenDialog(MetroWindow window, BaseMetroDialog dialog)
         {
             dialog.SetValue(Panel.ZIndexProperty, (int)window.overlayBox.GetValue(Panel.ZIndexProperty) + 1);

diff --git a/Mahapps.Metro.Tests/CustomDialogTest.cs b/Mahapps.Metro.Tests/CustomDialogTest.cs
@@ -22,10 +22,20 @@ public async Task ReceivesDataContext()
 
             await TestHost.SwitchToAppThread(); // No idea why we have to do this again
 
+            Assert.Equal(await window.GetCurrentDialogAsync<CustomDialog>(), dialog);
+            Assert.NotNull(await window.GetCurrentDialogAsync<BaseMetroDialog>());
+            Assert.Null(await window.GetCurrentDialogAsync<MessageDialog>());
+
             dialog.DataContext = vm;
             var textBlock = dialog.FindChild<TextBlock>("TheDialogBody");
 
             Assert.Equal(vm.Text, textBlock.Text);
+
+            await window.HideMetroDialogAsync(dialog);
+
+            await TestHost.SwitchToAppThread(); // No idea why we have to do this again
+
+            Assert.Null(await window.GetCurrentDialogAsync<MessageDialog>());
         }
 
         private class TheViewModel