Fixed auto-sized elements sometimes updating their location based on …

…outdated parent positions
Ellpeck · Jun 9, 2024 · 6a5e9a7 · 6a5e9a7
1 parent d7cda0d
commit 6a5e9a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@ Improvements
 Fixes
 - Fixed hidden scroll bars inhibiting scrolling on their parent panel
 - Fixed scroll bars doing unnecessary calculations when hidden
+- Fixed auto-sized elements sometimes updating their location based on outdated parent positions
 
 ## 6.3.1
 

diff --git a/MLEM.Ui/Elements/Element.cs b/MLEM.Ui/Elements/Element.cs
@@ -683,20 +683,22 @@ public virtual void ForceUpdateArea() {
                 return;
             this.stopwatch.Restart();
 
-            var parentArea = this.ParentArea;
-            var parentCenterX = parentArea.X + parentArea.Width / 2;
-            var parentCenterY = parentArea.Y + parentArea.Height / 2;
-            var actualSize = this.CalcActualSize(parentArea);
-
             var recursion = 0;
-            UpdateDisplayArea(actualSize);
+            UpdateDisplayArea();
 
             this.stopwatch.Stop();
             this.System.Metrics.ForceAreaUpdateTime += this.stopwatch.Elapsed;
             this.System.Metrics.ForceAreaUpdates++;
 
-            void UpdateDisplayArea(Vector2 newSize) {
+            void UpdateDisplayArea(Vector2? overrideSize = null) {
+                var parentArea = this.ParentArea;
+                var parentCenterX = parentArea.X + parentArea.Width / 2;
+                var parentCenterY = parentArea.Y + parentArea.Height / 2;
+
+                var intendedSize = this.CalcActualSize(parentArea);
+                var newSize = overrideSize ?? intendedSize;
                 var pos = new Vector2();
+
                 switch (this.anchor) {
                     case Anchor.TopLeft:
                     case Anchor.AutoLeft:
@@ -822,9 +824,9 @@ void UpdateDisplayArea(Vector2 newSize) {
                     }
 
                     if (this.TreatSizeAsMinimum) {
-                        autoSize = Vector2.Max(autoSize, actualSize);
+                        autoSize = Vector2.Max(autoSize, intendedSize);
                     } else if (this.TreatSizeAsMaximum) {
-                        autoSize = Vector2.Min(autoSize, actualSize);
+                        autoSize = Vector2.Min(autoSize, intendedSize);
                     }
 
                     // we want to leave some leeway to prevent float rounding causing an infinite loop