tidy up

src/CppExplorer.csproj

@@ -129,8 +129,8 @@
     <Compile Include="CachedObjects\CacheMethod.cs" />
     <Compile Include="CppExplorer.cs" />
     <Compile Include="Extensions\ReflectionExtensions.cs" />
-    <Compile Include="Unstripping\GUIUnstrip.cs" />
+    <Compile Include="UnstripFixes\GUIUnstrip.cs" />
-    <Compile Include="Unstripping\ScrollViewStateUnstrip.cs" />
+    <Compile Include="UnstripFixes\ScrollViewStateUnstrip.cs" />
     <Compile Include="Extensions\UnityExtensions.cs" />
     <Compile Include="Helpers\PageHelper.cs" />
     <Compile Include="Helpers\ReflectionHelpers.cs" />
@@ -138,8 +138,8 @@
     <Compile Include="Helpers\UnityHelpers.cs" />
     <Compile Include="MainMenu\InspectUnderMouse.cs" />
     <Compile Include="CachedObjects\CacheObjectBase.cs" />
-    <Compile Include="Unstripping\SliderHandlerUnstrip.cs" />
+    <Compile Include="UnstripFixes\SliderHandlerUnstrip.cs" />
-    <Compile Include="Unstripping\UnstripExtensions.cs" />
+    <Compile Include="UnstripFixes\UnstripExtensions.cs" />
     <Compile Include="Windows\ResizeDrag.cs" />
     <Compile Include="Windows\TabViewWindow.cs" />
     <Compile Include="Windows\UIWindow.cs" />

src/UnstripFixes/GUIUnstrip.cs

@@ -13,13 +13,6 @@ using Harmony;
 
 namespace Explorer
 {
-    // This is a copy+paste of UnityEngine source code, fixed for Il2Cpp.
-    // Taken from dnSpy output using Unity 2018.4.20.
-
-    // Subject to Unity's License and ToS.
-    // https://unity3d.com/legal/terms-of-service
-    // https://unity3d.com/legal/terms-of-service/software
-
     public class GUIUnstrip
     {
         public static int s_ScrollControlId;
@@ -41,9 +34,6 @@ namespace Explorer
 
         // ======= public methods ======= //   
 
-        // Fix for GUILayoutUtility.GetLastRect().
-        // Calls UnstripExtensions.GetLastUnstripped().
-
         public static Rect GetLastRect()
         {
             EventType type = Event.current.type;
@@ -59,8 +49,6 @@ namespace Explorer
             return last;
         }
 
-        // Simple unstrips for HorizontalScrollbar and VerticalScrollbar, they just call the Scroller unstrip.
-
         public static float HorizontalScrollbar(Rect position, float value, float size, float leftValue, float rightValue, GUIStyle style)
         {
             return Scroller_Impl(position, value, size, leftValue, rightValue, style, 
@@ -80,7 +68,6 @@ namespace Explorer
         }
 
         // Fix for BeginScrollView.
-        // Uses several manually unstripped methods.
 
         public static Vector2 BeginScrollView(Vector2 scroll, params GUILayoutOption[] options)
         {
@@ -98,7 +85,7 @@ namespace Explorer
                 }
             }
 
-            // Try manual unstripping implementation.
+            // Try manual implementation.
             if (!ManualUnstripFailed)
             {
                 try
@@ -107,7 +94,7 @@ namespace Explorer
                 }
                 catch (Exception e)
                 {
-                    MelonLogger.Log("Exception on GUIUnstrip.BeginScrollView_Impl: " + e.GetType() + ", " + e.Message + "\r\n" + e.StackTrace);
+                    MelonLogger.Log("Exception on GUIUnstrip.BeginScrollView_ImplLayout: " + e.GetType() + ", " + e.Message + "\r\n" + e.StackTrace);
 
                     ManualUnstripFailed = true;
                     return scroll;
@@ -136,8 +123,6 @@ namespace Explorer
 
         // ======= private methods ======= //
 
-        // Actual unstrip of GUILayout.BeginScrollView()
-
         private static Vector2 BeginScrollView_ImplLayout(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, 
             GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
         {
@@ -171,8 +156,6 @@ namespace Explorer
             );
         }
 
-        // Actual unstrip of GUI.BeginScrollView()
-
         private static Vector2 BeginScrollView_Impl(Rect position, Vector2 scrollPosition, Rect viewRect, bool alwaysShowHorizontal, 
             bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background)
         {
@@ -296,8 +279,6 @@ namespace Explorer
             return scrollPosition;
         }
 
-        // Actual unstrip of GUI.EndScrollView()
-
         private static void EndScrollView_Impl(bool handleScrollWheel)
         {
             GUIUtility.CheckOnGUI();
@@ -336,8 +317,6 @@ namespace Explorer
             }
         }
 
-        // Actual unstrip of GUI.Scroller
-
         private static float Scroller_Impl(Rect position, float value, float size, float leftValue, float rightValue, GUIStyle slider, GUIStyle thumb, GUIStyle leftButton, GUIStyle rightButton, bool horiz)
         {
             GUIUtility.CheckOnGUI();
@@ -384,8 +363,6 @@ namespace Explorer
             return value;
         }
 
-        // Actual unstrip of GUI.Slider
-
         public static float Slider(Rect position, float value, float size, float start, float end, GUIStyle slider, GUIStyle thumb, bool horiz, int id)
         {
             if (id == 0)
@@ -396,8 +373,6 @@ namespace Explorer
             return sliderHandler.Handle();
         }
 
-        // Actual unstrip of GUI.ScrollerRepeatButton
-
         private static bool ScrollerRepeatButton_Impl(int scrollerID, Rect rect, GUIStyle style)
         {
             bool result = false;

src/UnstripFixes/ScrollViewStateUnstrip.cs

@@ -9,13 +9,6 @@ using UnityEngine;
 
 namespace Explorer
 {
-    // This is a copy+paste of UnityEngine source code, fixed for Il2Cpp.
-    // Taken from dnSpy output using Unity 2018.4.20.
-
-    // Subject to Unity's License and ToS.
-    // https://unity3d.com/legal/terms-of-service
-    // https://unity3d.com/legal/terms-of-service/software
-
     public class ScrollViewStateUnstrip
     {
         public Rect position;
@@ -24,9 +17,6 @@ namespace Explorer
         public Vector2 scrollPosition;
         public bool apply;
 
-        // The code below is not unstripped. 
-        // This is a custom dictionary to allow for the manual implementation.
-
         public static Dictionary<IntPtr, ScrollViewStateUnstrip> Dict = new Dictionary<IntPtr, ScrollViewStateUnstrip>();
 
         public static ScrollViewStateUnstrip FromPointer(IntPtr ptr)

src/UnstripFixes/SliderHandlerUnstrip.cs

@@ -8,13 +8,6 @@ using UnhollowerRuntimeLib;
 
 namespace Explorer
 {
-	// This is a copy+paste of UnityEngine source code, fixed for Il2Cpp.
-	// Taken from dnSpy output using Unity 2018.4.20.
-
-	// Subject to Unity's License and ToS.
-	// https://unity3d.com/legal/terms-of-service
-	// https://unity3d.com/legal/terms-of-service/software
-
 	public struct SliderHandlerUnstrip
 	{
 		private readonly Rect position;

src/UnstripFixes/UnstripExtensions.cs

@@ -7,18 +7,8 @@ using UnityEngine;
 
 namespace Explorer
 {
-    // This is a copy+paste of UnityEngine source code, fixed for Il2Cpp.
-    // Taken from dnSpy output using Unity 2018.4.20.
-
-    // Subject to Unity's License and ToS.
-    // https://unity3d.com/legal/terms-of-service
-    // https://unity3d.com/legal/terms-of-service/software
-
     public static class UnstripExtensions
     {
-        // This is a manual unstrip of GUILayoutGroup.GetLast().
-        // I'm using it as an Extension because it's easier this way.
-
         public static Rect GetLastUnstripped(this GUILayoutGroup group)
         {
             Rect result;