Merge pull request #96 from immersivecognition/personal/jack/2021

editor helpers fix for 2021

Author: jackbrookes

Assets/UXF/Scripts/Etc/Editor/EasyEventEditor.cs

@@ -335,13 +335,17 @@ private static void ApplyEventDrawerPatch(bool enableOverride)
 
     public static void ApplyEventPropertyDrawerPatch(bool forceApply = false)
     {
+#if UNITY_2021_1_OR_NEWER
+    // no need in Unity 2021
+#else
         EEESettings settings = GetEditorSettings();
 
         if (!patchApplied || forceApply)
         {
             ApplyEventDrawerPatch(settings.overrideEventDrawer);
             patchApplied = true;
         }
+#endif
     }
 
     public static EEESettings GetEditorSettings()
@@ -382,7 +386,7 @@ internal class SettingsGUIContent
     public static void DrawSettingsButtons(EasyEventEditorHandler.EEESettings settings)
     {
         EditorGUI.indentLevel += 1;
-
+//
         settings.overrideEventDrawer = EditorGUILayout.ToggleLeft(enableToggleGuiContent, settings.overrideEventDrawer);
 
         EditorGUI.BeginDisabledGroup(!settings.overrideEventDrawer);
@@ -403,6 +407,9 @@ public static void DrawSettingsButtons(EasyEventEditorHandler.EEESettings settin
 // Using the IMGUI method
 static class EasyEventEditorSettingsProvider
 {
+#if UNITY_2021_1_OR_NEWER
+    // no need in Unity 2021
+#else
     [SettingsProvider]
     public static SettingsProvider CreateSettingsProvider()
     {
@@ -430,11 +437,15 @@ public static SettingsProvider CreateSettingsProvider()
 
         return provider;
     }
+#endif
 }
-#else
 public class EasyEventEditorSettings : EditorWindow
 {
+#if UNITY_2021_1_OR_NEWER
+    // no need in Unity 2021
+#else
     [MenuItem("Edit/Easy Event Editor Settings")]
+#endif
     static void Init()
     {
         EasyEventEditorSettings window = GetWindow<EasyEventEditorSettings>(false, "EEE Settings");
@@ -917,7 +928,7 @@ MethodInfo InvokeFindMethod(string functionName, object targetObject, UnityEvent
             findMethod = eventObject.GetType().GetMethod("FindMethod", BindingFlags.NonPublic | BindingFlags.Instance, null,
                     new System.Type[] {
                     typeof(string),
-#if UNITY_2020_1_OR_NEWER
+#if UNITY_2021_1_OR_NEWER
                     typeof(System.Type),
 #else
                     typeof(object),
@@ -936,7 +947,7 @@ MethodInfo InvokeFindMethod(string functionName, object targetObject, UnityEvent
             return null;
         }
 
-#if UNITY_2020_1_OR_NEWER
+#if UNITY_2021_1_OR_NEWER
         return findMethod.Invoke(eventObject, new object[] {functionName, targetObject?.GetType(), listenerMode, argType }) as MethodInfo;
 #else
         return findMethod.Invoke(eventObject, new object[] {functionName, targetObject, listenerMode, argType }) as MethodInfo;

Assets/UXF/Scripts/Etc/ReorderableInspector/Editor/ReorderableArrayInspector.cs

@@ -785,7 +785,7 @@ protected void DrawPropertySortableArray(SerializedProperty property)
 				bool isStartProp = targetProp.propertyPath.StartsWith("m_");
 				using (new EditorGUI.DisabledScope(isStartProp))
 				{
-					EditorGUILayout.PropertyField(targetProp, targetProp.isExpanded);
+					EditorGUILayout.PropertyField(targetProp, true);
 				}
 			}
 		}