diff --git a/MiraAPI/LocalSettings/LocalSettingsTab.cs b/MiraAPI/LocalSettings/LocalSettingsTab.cs index 310c2c08..25eabf30 100644 --- a/MiraAPI/LocalSettings/LocalSettingsTab.cs +++ b/MiraAPI/LocalSettings/LocalSettingsTab.cs @@ -105,12 +105,17 @@ public abstract class LocalSettingsTab(ConfigFile config) label.Key.text = $"{label.Value.Translate()}"; } + } - if (Scroller != null) + internal void RefreshScrollBounds() + { + if (Scroller == null) { - Scroller.SetBounds(new FloatRange(0, MaxScroll), new FloatRange(0, 0)); - Scroller.ScrollToTop(); + return; } + + Scroller.SetBounds(new FloatRange(0, MaxScroll), new FloatRange(0, 0)); + Scroller.ScrollToTop(); } /// diff --git a/MiraAPI/Patches/LocalSettings/OptionsMenuPatches.cs b/MiraAPI/Patches/LocalSettings/OptionsMenuPatches.cs index 6b64159e..38fb9895 100644 --- a/MiraAPI/Patches/LocalSettings/OptionsMenuPatches.cs +++ b/MiraAPI/Patches/LocalSettings/OptionsMenuPatches.cs @@ -1,6 +1,8 @@ -using System.Collections.Generic; +using System.Collections; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; +using BepInEx.Unity.IL2CPP.Utils.Collections; using HarmonyLib; using Il2CppInterop.Runtime.InteropTypes.Arrays; using MiraAPI.LocalSettings; @@ -183,7 +185,9 @@ public static class OptionsMenuPatches // Tabs with index 10 and above are the mod settings tabs if (index >= 10) { - CustomOpen(LocalSettingsManager.AvailableTabs[index - 10]); + var tab = LocalSettingsManager.AvailableTabs[index - 10]; + CustomOpen(tab); + __instance.StartCoroutine(RefreshScrollBoundsAfterOpen(__instance, tab).WrapToIl2Cpp()); return false; } @@ -229,6 +233,16 @@ public static class OptionsMenuPatches tab.Open(); } + private static IEnumerator RefreshScrollBoundsAfterOpen(OptionsMenuBehaviour menu, LocalSettingsTab tab) + { + yield return new WaitForEndOfFrame(); + + if (menu && tab.TabButton?.Content && tab.TabButton.Content.activeInHierarchy) + { + tab.RefreshScrollBounds(); + } + } + private static void CustomClose(LocalSettingsTab tab) { if (tab.TabButton?.Button)