fix: Set IsVisualTreeRoot flag on all platforms

unoplatform · Feb 3, 2021 · ce2641d · ce2641d
1 parent 9be2a95
commit ce2641d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Window.Android.cs b/src/Uno.UI/UI/Xaml/Window.Android.cs
@@ -56,6 +56,7 @@ private void InternalSetContent(UIElement value)
 
 				_main = new Grid()
 				{
+					IsVisualTreeRoot = true,
 					Children =
 					{
 						_rootBorder,

diff --git a/src/Uno.UI/UI/Xaml/Window.Desktop.cs b/src/Uno.UI/UI/Xaml/Window.Desktop.cs
@@ -31,7 +31,17 @@ partial void InternalActivate()
 
 		private void InternalSetContent(UIElement value)
 		{
+			if (_content != null)
+			{
+				_content.IsWindowRoot = false;
+				_content.IsVisualTreeRoot = false;
+			}
+
 			_content = value;
+
+			_content.IsWindowRoot = true;
+			_content.IsVisualTreeRoot = true;
+
 			TryLoadContent();
 		}
 

diff --git a/src/Uno.UI/UI/Xaml/Window.iOS.cs b/src/Uno.UI/UI/Xaml/Window.iOS.cs
@@ -98,6 +98,7 @@ private void InternalSetContent(UIElement value)
 
 				_main = new Grid()
 				{
+					IsVisualTreeRoot = true,
 					Children =
 					{
 						_rootBorder,

diff --git a/src/Uno.UI/UI/Xaml/Window.macOS.cs b/src/Uno.UI/UI/Xaml/Window.macOS.cs
@@ -85,6 +85,7 @@ private void InternalSetContent(UIElement value)
 
 				_main = new Grid()
 				{
+					IsVisualTreeRoot = true,
 					Children =
 					{
 						_rootBorder,

diff --git a/src/Uno.UI/UI/Xaml/Window.wasm.cs b/src/Uno.UI/UI/Xaml/Window.wasm.cs
@@ -146,6 +146,7 @@ private void InternalSetContent(UIElement content)
 				_popupRoot = new PopupRoot();
 				_window = new Grid()
 				{
+					IsVisualTreeRoot = true,
 					Children =
 					{
 						_rootScrollViewer,