Optimize GetChildOfType<T> Method

MakesYT · Jan 29, 2024 · a77bcc6 · a77bcc6
1 parent d002e07
commit a77bcc6
Showing 1 changed file with 26 additions and 11 deletions.
diff --git a/NodifyM.Avalonia/Helpers/DependencyObjectExtensions.cs b/NodifyM.Avalonia/Helpers/DependencyObjectExtensions.cs
@@ -33,27 +33,42 @@ internal static class DependencyObjectExtensions
 
 
         }
-        public static T? GetChildOfType<T>(this Control control,string? name=null)
+        public static T? GetChildOfType<T>(this Control control, string? name = null)
             where T : Control
         {
-            if ((name ==null||control.Name == name)&& control is T control1)
-                return control1;
+            var stack = new Stack<Control>();
+            stack.Push(control);
 
-            foreach (var child in control.GetVisualChildren())
+            while (stack.Count > 0)
             {
-                var foundChild = child as Control;
-                if (foundChild != null && (name==null||foundChild.Name == name)&& foundChild is T child1)
-                    return child1;
-                else
+                var currentControl = stack.Pop();
+
+                if (string.IsNullOrEmpty(name) && currentControl is T targetControl)
+                {
+                    return targetControl;
+                }
+
+                foreach (var child in currentControl.GetVisualChildren())
                 {
-                    var result = ((foundChild).GetChildOfType<T>(name));
-                    if (result != null)
-                        return (T)result;
+                    var childControl = child as Control;
+                    if (childControl != null)
+                    {
+                        if (string.IsNullOrEmpty(name) || childControl.Name == name)
+                        {
+                            if (childControl is T targetChild)
+                            {
+                                return targetChild;
+                            }
+                        }
+
+                        stack.Push(childControl);
+                    }
                 }
             }
 
             return null;
         }
+
         public static T? GetVisualAt<T>(this Control control,Point anchor)
             where T : Control
         {