fix: setting XamlRoot

PrismLibrary · Oct 11, 2023 · df68b81 · df68b81
1 parent 17b9843
commit df68b81
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/Uno/Prism.Uno/Dialogs/DialogWindow.xaml.cs b/src/Uno/Prism.Uno/Dialogs/DialogWindow.xaml.cs
@@ -10,9 +10,10 @@ namespace Prism.Dialogs
     /// </summary>
     public partial class DialogWindow : ContentDialog, IDialogWindow
     {
-        public DialogWindow()
+        public DialogWindow(Window window)
         {
             this.InitializeComponent();
+            XamlRoot = window.Content.XamlRoot;
         }
         public IDialogResult? Result { get; set; }
 

diff --git a/src/Uno/Prism.Uno/Dialogs/IDialogWindow.cs b/src/Uno/Prism.Uno/Dialogs/IDialogWindow.cs
@@ -20,7 +20,7 @@ public interface IDialogWindow
 
         object? Content { get; set; }
 
-        IAsyncOperation<ContentDialogResult> ShowAsync();
+        IAsyncOperation<ContentDialogResult> ShowAsync(ContentDialogPlacement placement);
 
         void Hide();
     }

diff --git a/src/Uno/Prism.Uno/PrismApplicationBase.cs b/src/Uno/Prism.Uno/PrismApplicationBase.cs
@@ -109,6 +109,7 @@ protected virtual void Initialize(IApplicationBuilder builder)
                 .Configure(x => x.ConfigureServices(ConfigureServices)
                     .UseServiceProviderFactory(new PrismServiceProviderFactory(_containerExtension)));
 
+            _containerExtension.RegisterInstance(builder.Window);
             RegisterRequiredTypes(_containerExtension);
             RegisterTypes(_containerExtension);
             _containerExtension.FinalizeExtension();