Cache children

dotnet · May 11, 2024 · 5056720 · 5056720
1 parent 43bd398
commit 5056720
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/src/Core/src/Platform/Windows/ContentPanel.cs b/src/Core/src/Platform/Windows/ContentPanel.cs
@@ -48,7 +48,7 @@ internal FrameworkElement? Content
 		public ContentPanel()
 		{
 			_borderPath = new Path();
-			EnsureBorderPath();
+			EnsureBorderPath(containsCheck: false);
 
 			SizeChanged += ContentPanelSizeChanged;
 		}
@@ -72,9 +72,18 @@ void ContentPanelSizeChanged(object sender, SizeChangedEventArgs e)
 			UpdateClip(_borderStroke?.Shape, width, height);
 		}
 
-		internal void EnsureBorderPath()
+		internal void EnsureBorderPath(bool containsCheck = true)
 		{
-			if (!Children.Contains(_borderPath))
+			if (containsCheck)
+			{
+				var children = Children;
+
+				if (!children.Contains(_borderPath))
+				{
+					children.Add(_borderPath);
+				}
+			}
+			else
 			{
 				Children.Add(_borderPath);
 			}
@@ -140,8 +149,12 @@ void AddContent(FrameworkElement? content)
 				return;
 			}
 
-			if (!Children.Contains(_content))
-				Children.Add(_content);
+			var children = Children;
+
+			if (!children.Contains(_content))
+			{
+				children.Add(_content);
+			}
 		}
 
 		void UpdateClip(IShape? borderShape, double width, double height)