Merge pull request #128 from punker76/fix/#117-childwindow-isopen-check

Check if a dialog is already open and a children of a panel
punker76 · Oct 3, 2022 · b034499 · b034499
2 parents d034cba + b4742ba
commit b034499
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 38 deletions.
diff --git a/src/MahApps.Metro.SimpleChildWindow.Demo/MainWindow.xaml b/src/MahApps.Metro.SimpleChildWindow.Demo/MainWindow.xaml
@@ -1,13 +1,19 @@
-<Controls:MetroWindow x:Class="MahApps.Metro.SimpleChildWindow.Demo.MainWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
-                      Title="MahApps.Metro Simple ChildWindow Demo"
-                      Width="700"
-                      Height="600"
-                      GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
-                      WindowStartupLocation="CenterScreen">
+<mah:MetroWindow x:Class="MahApps.Metro.SimpleChildWindow.Demo.MainWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
+                 Title="MahApps.Metro Simple ChildWindow Demo"
+                 Width="700"
+                 Height="600"
+                 GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
+                 WindowStartupLocation="CenterScreen">
+
+    <mah:MetroWindow.RightWindowCommands>
+        <mah:WindowCommands>
+            <Button Click="Title_OnClick" Content="Test Dialog" />
+        </mah:WindowCommands>
+    </mah:MetroWindow.RightWindowCommands>
 
     <Grid x:Name="RootGrid">
 
@@ -82,4 +88,4 @@
 
     </Grid>
 
-</Controls:MetroWindow>
+</mah:MetroWindow>
diff --git a/src/MahApps.Metro.SimpleChildWindow.Demo/MainWindow.xaml.cs b/src/MahApps.Metro.SimpleChildWindow.Demo/MainWindow.xaml.cs
@@ -17,6 +17,11 @@ public MainWindow()
             this.InitializeComponent();
         }
 
+        private async void Title_OnClick(object sender, RoutedEventArgs e)
+        {
+            await this.ShowChildWindowAsync(this.child01);
+        }
+
         private void FirstTest_OnClick(object sender, RoutedEventArgs e)
         {
             this.child01.SetCurrentValue(ChildWindow.IsOpenProperty, true);

diff --git a/src/MahApps.Metro.SimpleChildWindow.Demo/TestChildWindow.xaml.cs b/src/MahApps.Metro.SimpleChildWindow.Demo/TestChildWindow.xaml.cs
@@ -4,24 +4,24 @@
 
 namespace MahApps.Metro.SimpleChildWindow.Demo
 {
-	/// <summary>
-	/// Interaction logic for TestChildWindow.xaml
-	/// </summary>
-	public partial class TestChildWindow : ChildWindow
-	{
-		public TestChildWindow()
-		{
-			InitializeComponent();
-		}
+    /// <summary>
+    /// Interaction logic for TestChildWindow.xaml
+    /// </summary>
+    public partial class TestChildWindow : ChildWindow
+    {
+        public TestChildWindow()
+        {
+            InitializeComponent();
+        }
 
-		private async void MessageButtonOnClick(object sender, RoutedEventArgs e)
-		{
-			await ((MetroWindow)Window.GetWindow(this)).ShowMessageAsync("Title", "Message");
-		}
+        private async void MessageButtonOnClick(object sender, RoutedEventArgs e)
+        {
+            await ((MetroWindow)Window.GetWindow(this)).ShowMessageAsync("Title", "Message");
+        }
 
-		private void CloseSec_OnClick(object sender, RoutedEventArgs e)
-		{
-			this.Close();
-		}
-	}
+        private void CloseSec_OnClick(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+    }
 }
diff --git a/src/MahApps.Metro.SimpleChildWindow/ChildWindowManager.cs b/src/MahApps.Metro.SimpleChildWindow/ChildWindowManager.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using MahApps.Metro.Controls;
 
 namespace MahApps.Metro.SimpleChildWindow
 {
@@ -138,18 +139,24 @@ public static async Task<TResult> ShowChildWindowAsync<TResult>(this Window wind
 
         private static async Task<TResult> OpenDialogAsync<TResult>(ChildWindow dialog, Panel container, TaskCompletionSource<TResult> tcs)
         {
-            container.Children.Add(dialog);
-
-            void OnDialogClosingFinished(object sender, RoutedEventArgs args)
+            if (!dialog.IsOpen)
             {
-                dialog.ClosingFinished -= OnDialogClosingFinished;
-                container.Children.Remove(dialog);
-                tcs.TrySetResult(dialog.ChildWindowResult is TResult result ? result : (dialog.ClosedBy is TResult closedBy ? closedBy : default));
-            }
+                if (dialog.TryFindParent<Panel>() is null)
+                {
+                    container.Children.Add(dialog);
+                }
 
-            dialog.ClosingFinished += OnDialogClosingFinished;
+                void OnDialogClosingFinished(object sender, RoutedEventArgs args)
+                {
+                    dialog.ClosingFinished -= OnDialogClosingFinished;
+                    container.Children.Remove(dialog);
+                    tcs.TrySetResult(dialog.ChildWindowResult is TResult result ? result : (dialog.ClosedBy is TResult closedBy ? closedBy : default));
+                }
 
-            dialog.SetCurrentValue(ChildWindow.IsOpenProperty, true);
+                dialog.ClosingFinished += OnDialogClosingFinished;
+
+                dialog.SetCurrentValue(ChildWindow.IsOpenProperty, true);
+            }
 
             return await tcs.Task;
         }