diff --git a/MiraAPI/Utilities/Helpers.cs b/MiraAPI/Utilities/Helpers.cs index 94fea9f2..76107a04 100644 --- a/MiraAPI/Utilities/Helpers.cs +++ b/MiraAPI/Utilities/Helpers.cs @@ -1040,7 +1040,6 @@ public static class Helpers } } - var contentBottom = float.PositiveInfinity; var previousGroup = (AbstractOptionGroup?)null; var rowIndex = 0; var column = 0; @@ -1155,12 +1154,6 @@ public static class Helpers renderer.maskInteraction = SpriteMaskInteraction.VisibleInsideMask; renderer.material.SetInt(PlayerMaterial.MaskLayer, 50); renderer.sortingOrder = contentSortingOrder; - if (renderer.enabled && renderer.sprite) - { - contentBottom = Mathf.Min( - contentBottom, - inner.InverseTransformPoint(renderer.bounds.min).y); - } } foreach (var text in header.GetComponentsInChildren(true)) @@ -1171,9 +1164,6 @@ public static class Helpers if (text.enabled) { text.ForceMeshUpdate(); - contentBottom = Mathf.Min( - contentBottom, - inner.InverseTransformPoint(text.bounds.min).y); } } @@ -1238,27 +1228,6 @@ public static class Helpers renderer.maskInteraction = SpriteMaskInteraction.VisibleInsideMask; renderer.material.SetInt(PlayerMaterial.MaskLayer, 50); renderer.sortingOrder = contentSortingOrder; - if (renderer.enabled && - renderer.sprite && - renderer.transform != row.PlusBtn.transform && - !renderer.transform.IsChildOf(row.PlusBtn.transform) && - renderer.transform != row.MinusBtn.transform && - !renderer.transform.IsChildOf(row.MinusBtn.transform)) - { - contentBottom = Mathf.Min( - contentBottom, - inner.InverseTransformPoint(renderer.bounds.min).y); - } - } - - foreach (var text in row.GetComponentsInChildren(true)) - { - if (text.enabled) - { - contentBottom = Mathf.Min( - contentBottom, - inner.InverseTransformPoint(text.bounds.min).y); - } } row.gameObject.SetActive(true); @@ -1277,6 +1246,26 @@ public static class Helpers } } + page.SetActive(true); + var contentBottom = float.PositiveInfinity; + foreach (var text in page.GetComponentsInChildren(true)) + { + if (text.enabled && text.gameObject.activeInHierarchy) + { + text.ForceMeshUpdate(); + } + } + + foreach (var renderer in page.GetComponentsInChildren(true)) + { + if (renderer.enabled && renderer.gameObject.activeInHierarchy) + { + contentBottom = Mathf.Min( + contentBottom, + inner.InverseTransformPoint(renderer.bounds.min).y); + } + } + var maskArea = parent.transform.FindChild("MaskArea")?.GetComponent(); var maskBottom = maskArea ? inner.InverseTransformPoint(maskArea!.bounds.min).y @@ -1288,7 +1277,6 @@ public static class Helpers ? contentOverflow + 0.05f : 0f; parent.SetYBoundsMax(Mathf.Clamp(scrollRange, 0f, 999f)); - page.SetActive(true); return page; }