Merge branch 'develop' into main

punker76 · Nov 5, 2022 · f17d0de · f17d0de
2 parents 98278c6 + 429d1d4
commit f17d0de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -5,7 +5,7 @@
         <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
         <GenerateDocumentationFile>false</GenerateDocumentationFile>
         <AutoGenerateBindingRedirects Condition=" $(TargetFramework.StartsWith('net4')) ">true</AutoGenerateBindingRedirects>
-        <LangVersion>8.0</LangVersion>
+        <LangVersion>9</LangVersion>
         <DebugSymbols>true</DebugSymbols>
         <DebugType>full</DebugType>
         <NoWarn>$(NoWarn);CS1591</NoWarn>

diff --git a/src/MahApps.Metro.SimpleChildWindow/ChildWindowManager.cs b/src/MahApps.Metro.SimpleChildWindow/ChildWindowManager.cs
@@ -139,9 +139,11 @@ public static async Task<TResult> ShowChildWindowAsync<TResult>(this Control con
 
         private static async Task<TResult> OpenDialogAsync<TResult>(ChildWindow dialog, Panel container, TaskCompletionSource<TResult> tcs)
         {
-            if (!dialog.IsOpen)
+            var hasParent = dialog.TryFindParent<Panel>() is not null;
+
+            if (!dialog.IsOpen || !hasParent)
             {
-                if (dialog.TryFindParent<Panel>() is null)
+                if (!hasParent)
                 {
                     container.Children.Add(dialog);
                 }

diff --git a/src/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.csproj b/src/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.csproj
@@ -18,11 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Compile DependentUpon="%(Filename)"
-                 SubType="Code"
-                 Update="**\obj\**\*.g$(DefaultLanguageSourceExtension)" />
-        <Compile DependentUpon="%(Filename)"
-                 SubType="Designer"
-                 Update="**\*.xaml$(DefaultLanguageSourceExtension)" />
+        <Compile DependentUpon="%(Filename)" SubType="Code" Update="**\obj\**\*.g$(DefaultLanguageSourceExtension)" />
+        <Compile DependentUpon="%(Filename)" SubType="Designer" Update="**\*.xaml$(DefaultLanguageSourceExtension)" />
     </ItemGroup>
 </Project>