Unstable 0.16.1.0

Barotrauma/BarotraumaClient/ClientSource/GUI/GUICanvas.cs

@@ -22,13 +22,14 @@ namespace Barotrauma
                     {
                         GameMain.Instance.ResolutionChanged += RecalculateSize;
                     }
-                    _instance.ItemComponentHolder = new GUIFrame(new RectTransform(Vector2.One, _instance, Anchor.Center)).RectTransform;
+                    _instance.ChildrenChanged += OnChildrenChanged;
                 }
                 return _instance;
             }
         }
 
-        public RectTransform ItemComponentHolder;
+        //GUICanvas stores the children as weak references, to allow elements that we no longer need to get garbage collected
+        private readonly List<WeakReference<RectTransform>> childrenWeakRef = new List<WeakReference<RectTransform>>();
 
         private static Vector2 size => new Vector2(GameMain.GraphicsWidth / (float)GUI.UIWidth, 1f);
 
@@ -36,16 +37,41 @@ namespace Barotrauma
 
         private enum ResizeAxis { Both = 0, X = 1, Y = 2 }
 
+        private static void OnChildrenChanged(RectTransform _)
+        {
+            //add weak reference if we don't have one yet
+            foreach (var child in _instance.Children)
+            {
+                if (!_instance.childrenWeakRef.Any(c => c.TryGetTarget(out var existingChild) && existingChild == child))
+                {
+                    _instance.childrenWeakRef.Add(new WeakReference<RectTransform>(child));
+                }
+            }
+            //get rid of strong references
+            _instance.children.Clear();
+            //remove dead children
+            for (int i = _instance.childrenWeakRef.Count - 2; i >= 0; i--)
+            {
+                if (!_instance.childrenWeakRef[i].TryGetTarget(out var child) || child.Parent != _instance)
+                {
+                    _instance.childrenWeakRef.RemoveAt(i);
+                }
+            }
+        }
+
         // Turn public, if there is a need to call this manually.
         private static void RecalculateSize()
         {
             Vector2 recalculatedSize = size;
 
             // Scale children that are supposed to encompass the whole screen so that they are properly scaled on ultrawide as well
-            for (int i = 0; i < Instance.Children.Count(); i++)
+            for (int i = 0; i < Instance.childrenWeakRef.Count; i++)
             {
-                RectTransform target = Instance.GetChild(i);
-                if (target == null || target.RelativeSize.X < 1 && target.RelativeSize.Y < 1) continue;
+                if (!_instance.childrenWeakRef[i].TryGetTarget(out RectTransform target) || target == null) { continue; };
+
+                _instance.children.Add(target);
+
+                if (target.RelativeSize.X < 1 && target.RelativeSize.Y < 1) { continue; }
 
                 ResizeAxis axis;
 
@@ -80,6 +106,7 @@ namespace Barotrauma
 
             Instance.Resize(size, resizeChildren: true);
             Instance.GetAllChildren().Select(c => c.GUIComponent as GUITextBlock).ForEach(t => t?.SetTextPos());
+            _instance.children.Clear();
         }
     }
 }