Update WindowedContentDialog.cs

Author: ghost1372

dev/DevWinUI.Controls/Controls/WindowedContentDialog/WindowedContentDialog.cs

@@ -172,7 +172,7 @@ private void HandleSmokeLayer(ContentDialogWindow dialogWindow)
             popup.Child = UnderlaySmokeLayer.CustomSmokeLayer;
         }
 
-        AttachPopupLifecycle(dialogWindow, popup);
+        AttachPopupLifecycle(dialogWindow, popup, isSmokeLayer: true);
     }
     private void HandleSystemBackdrop(ContentDialogWindow dialogWindow)
     {
@@ -189,7 +189,7 @@ private void HandleSystemBackdrop(ContentDialogWindow dialogWindow)
 
         backdropLayerCache = popup.Child as Border;
         backdropLayerCache.OpacityTransition = UnderlaySystemBackdrop.OpacityTransition;
-        AttachPopupLifecycle(dialogWindow, popup);
+        AttachPopupLifecycle(dialogWindow, popup, isSmokeLayer: false);
     }
 
     private void DisableOwnerEvents(ContentDialogWindow dialogWindow)
@@ -213,12 +213,20 @@ private void DialogWindow_Closed(object sender, WindowEventArgs e)
             control.IsEnabled = true;
     }
 
-    private void AttachPopupLifecycle(ContentDialogWindow dialogWindow, Popup popup)
+    private void AttachPopupLifecycle(ContentDialogWindow dialogWindow, Popup popup, bool isSmokeLayer)
     {
-        dialogWindow.Opened -= OnDialogWindowOpened;
-        dialogWindow.Closed -= DialogWindow_ClosedPopup;
+        if (isSmokeLayer)
+        {
+            dialogWindow.Opened -= OnDialogWindowOpened;
+            dialogWindow.Opened += OnDialogWindowOpened;
+        }
+        else
+        {
+            dialogWindow.Loaded -= OnDialogWindowOpened;
+            dialogWindow.Loaded += OnDialogWindowOpened;
+        }
 
-        dialogWindow.Opened += OnDialogWindowOpened;
+        dialogWindow.Closed -= DialogWindow_ClosedPopup;
         dialogWindow.Closed += DialogWindow_ClosedPopup;
 
         void OnDialogWindowOpened(object sender, EventArgs e)