Merge pull request #1827 from unoplatform/mergify/bp/legacy/2x/pr-1816

fix: Set Parent to be Window (backport #1816)
unoplatform · Aug 29, 2023 · 30c52ba · 30c52ba
2 parents 708a40b + 47d0a20
commit 30c52ba
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 11 deletions.
diff --git a/samples/MauiEmbedding/MauiEmbedding.MauiControls/SyncfusionDemoPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding.MauiControls/SyncfusionDemoPage.xaml.cs
@@ -5,5 +5,15 @@ public partial class SyncfusionDemoPage : ContentPage
 	public SyncfusionDemoPage()
 	{
 		InitializeComponent();
+
+		Loaded += SyncfusionDemoPage_Loaded;
+	}
+
+	private void SyncfusionDemoPage_Loaded(object sender, EventArgs e)
+	{
+		var pv = Window?.Handler?.PlatformView;
+		var hpv = Handler?.PlatformView;
+
+		var current = DeviceDisplay.Current;
 	}
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -22,6 +22,8 @@
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 		<ImplicitUsings>true</ImplicitUsings>
+
+		<UnoExtensionsGeneration_DisableCreateNewOnMetadataUpdateAttribute>True</UnoExtensionsGeneration_DisableCreateNewOnMetadataUpdateAttribute>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">

diff --git a/src/Uno.Extensions.Core.Generators/buildTransitive/Uno.Extensions.Core.props b/src/Uno.Extensions.Core.Generators/buildTransitive/Uno.Extensions.Core.props
@@ -1,12 +1,20 @@
 <Project>
 	<ItemGroup>
-		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableKeyEqualityGenerator" />
-
-		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableCompatibilityTypesGenerator" />
+		<!--System.Diagnostics.CodeAnalysis-->
+		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableDynamicallyAccessedMembersAttribute" />
+		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableMaybeNullAttribute" />
+		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableMaybeNullWhenAttribute" />
+		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableMemberNotNullWhenAttribute" />
 		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableNotNullIfNotNullAttribute" />
 		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableNotNullWhenAttribute" />
-		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableMemberNotNullWhenAttribute" />
+
+		<!--System.Reflection.Metadata-->
+		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableMetadataUpdateHandlerAttribute" />
+
+		<!--System.Runtime.CompilerServices-->
+		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableCreateNewOnMetadataUpdateAttribute" />
 		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableIsExternalInit" />
+		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableMetadataUpdateOriginalTypeAttribute" />
 		<CompilerVisibleProperty Include="UnoExtensionsGeneration_DisableModuleInitializerAttribute" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.Extensions.Maui.UI/MauiEmbedding.cs b/src/Uno.Extensions.Maui.UI/MauiEmbedding.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Maui.ApplicationModel;
 using Uno.Extensions.Hosting;
 
 namespace Uno.Extensions.Maui;
@@ -91,6 +92,15 @@ public static Microsoft.UI.Xaml.Application UseMauiEmbedding<TApp>(this Microsof
 
 		var mauiApp = mauiAppBuilder.Build();
 		mauiApp.InitializeMauiEmbeddingApp(app);
+
+#if WINDOWS
+		window.Activated += (s, args) =>
+		{
+			WindowStateManager.Default.OnActivated(window, args);
+		};
+#endif
+
+
 #endif
 		return app;
 	}
@@ -143,7 +153,7 @@ private static void InitializeApplicationMainPage(IApplication iApp)
 
 	private static void SetCoreWindow(this IApplication app, Microsoft.Maui.Controls.Window window)
 	{
-		if(app.Windows is List<Microsoft.Maui.Controls.Window> windows)
+		if (app.Windows is List<Microsoft.Maui.Controls.Window> windows)
 		{
 			windows.Add(window);
 		}

diff --git a/src/Uno.Extensions.Maui.UI/MauiEmbedding.windows.cs b/src/Uno.Extensions.Maui.UI/MauiEmbedding.windows.cs
@@ -31,11 +31,6 @@ private static void InitializeMauiEmbeddingApp(this MauiApp mauiApp, Application
 			throw new MauiEmbeddingException(Properties.Resources.TheApplicationMustInheritFromEmbeddingApplication);
 		}
 
-		//if (_clone is not null)
-		//{
-		//	app.Resources.Merge(_clone);
-		//}
-
 		embeddingApp.InitializeApplication(mauiApp.Services, iApp);
 		app.SetApplicationHandler(iApp, rootContext);
 		InitializeApplicationMainPage(iApp);

diff --git a/src/Uno.Extensions.Maui.UI/MauiHost.cs b/src/Uno.Extensions.Maui.UI/MauiHost.cs
@@ -49,7 +49,7 @@ dependencyObject is not MauiHost mauiHost ||
 			if(instance is VisualElement visualElement)
 			{
 				mauiHost.VisualElement = visualElement;
-				visualElement.Parent = app;
+				visualElement.Parent = app.Windows[0];
 				visualElement.BindingContext = mauiHost.DataContext;
 			}
 			else