Fix scroll not working in 2017 games

Author: sinai-dev

lib/mcs.NET35.dll

@@ -3,8 +3,6 @@
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityEngine.UI;
-using UnityEngine.EventSystems;
 using MelonLoader;
 
 namespace Explorer

src/Menu/MainMenu/MainMenu.cs

@@ -8,7 +8,6 @@
 using UnhollowerRuntimeLib;
 using UnityEngine;
 using UnityEngine.Events;
-using UnityEngine.EventSystems;
 
 namespace Explorer
 {

src/Menu/Windows/WindowManager.cs

@@ -20,28 +20,36 @@ public class GUIUnstrip
         public static bool ScrollFailed = false;
         public static bool ManualUnstripFailed = false;
 
-        private static GenericStack ScrollStack
+        private static GenericStack ScrollStack => m_scrollStack ?? GetScrollStack();
+        private static PropertyInfo m_scrollViewStatesInfo;
+        private static GenericStack m_scrollStack;
+
+        private static GenericStack GetScrollStack()
         {
-            get
+            if (m_scrollViewStatesInfo == null)
             {
-                if (m_scrollViewStatesInfo == null)
+                if (typeof(GUI).GetProperty("scrollViewStates", ReflectionHelpers.CommonFlags) is PropertyInfo scrollStatesInfo)
                 {
-                    try
-                    {
-                        m_scrollViewStatesInfo = typeof(GUI).GetProperty("scrollViewStates");
-                        if (m_scrollViewStatesInfo == null) throw new Exception();
-                    }
-                    catch
-                    {
-                        m_scrollViewStatesInfo = typeof(GUI).GetProperty("s_scrollViewStates");
-                    }
+                    m_scrollViewStatesInfo = scrollStatesInfo;
+                }
+                else if (typeof(GUI).GetProperty("s_ScrollViewStates", ReflectionHelpers.CommonFlags) is PropertyInfo s_scrollStatesInfo)
+                {
+                    m_scrollViewStatesInfo = s_scrollStatesInfo;
                 }
+            }
 
-                return (GenericStack)m_scrollViewStatesInfo?.GetValue(null, null);
+            if (m_scrollViewStatesInfo?.GetValue(null, null) is GenericStack stack)
+            {
+                m_scrollStack = stack;
+            }
+            else
+            {
+                m_scrollStack = new GenericStack();
             }
+
+            return m_scrollStack;
         }
-        private static PropertyInfo m_scrollViewStatesInfo;
-        
+
         public static void Space(float pixels)
         {
             GUIUtility.CheckOnGUI();
@@ -145,7 +153,7 @@ private static Vector2 BeginScrollView_ImplLayout(Vector2 scrollPosition, bool a
         private static Vector2 BeginScrollView_Impl(Rect position, Vector2 scrollPosition, Rect viewRect, bool alwaysShowHorizontal, 
             bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background)
         {
-            GUIUtility.CheckOnGUI();
+            // GUIUtility.CheckOnGUI();
 
             int controlID = GUIUtility.GetControlID(GUI.s_ScrollviewHash, FocusType.Passive);