fix(skia): Remove inner visual from panel on element removal

unoplatform · Sep 24, 2020 · 6bd6a03 · 6bd6a03
1 parent 4f02e17
commit 6bd6a03
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/Uno.UI/UI/Xaml/UIElement.Skia.cs b/src/Uno.UI/UI/Xaml/UIElement.Skia.cs
@@ -149,12 +149,7 @@ internal bool RemoveChild(UIElement child)
 		{
 			if (_children.Remove(child))
 			{
-				child.SetParent(null);
-
-				Visual?.Children.Remove(child.Visual);
-
-				OnChildRemoved(child);
-
+				InnerRemoveChild(child);
 				return true;
 			}
 			else
@@ -167,14 +162,20 @@ internal void ClearChildren()
 		{
 			foreach (var child in _children.ToArray())
 			{
-				child.SetParent(null);
-				OnChildRemoved(child);
+				InnerRemoveChild(child);
 			}
 
 			_children.Clear();
 			InvalidateMeasure();
 		}
 
+		private void InnerRemoveChild(UIElement child)
+		{
+			child.SetParent(null);
+			Visual?.Children.Remove(child.Visual);
+			OnChildRemoved(child);
+		}
+
 		internal UIElement FindFirstChild() => _children.FirstOrDefault();
 
 		public string Name { get; set; }