Merge pull request #51 from arimger/feature/forcing-default-lists

Feature/forcing default lists

Author: arimger

Assets/Editor Toolbox/Editor/ToolboxDefines.cs

@@ -0,0 +1,7 @@
+namespace Toolbox.Editor
+{
+    internal static class ToolboxDefines
+    {
+        internal const string defaultListsDefine = "TOOLBOX_FORCE_DEFAULT_LISTS";
+    }
+}

Assets/Editor Toolbox/Editor/ToolboxDefines.cs.meta

@@ -10,6 +10,11 @@ namespace Toolbox.Editor
 {
     using Toolbox.Editor.Drawers;
 
+    //TODO:
+    //1. dedicated class to initialize and hold drawer-related data
+    //2. dedicated class used for settings initialization
+    //3. separate logic for resettings active drawers
+
     internal static class ToolboxDrawerModule
     {
         [InitializeOnLoadMethod]
@@ -244,6 +249,7 @@ internal static void UpdateDrawers(IToolboxInspectorSettings settings)
             //create all type-only-related drawers
             PrepareTargetTypeDrawers(settings);
 
+            ForceDefaultLists(settings.ForceDefaultLists);
             //log errors into console only once
             validationEnabled = false;
         }
@@ -268,6 +274,18 @@ internal static bool HasTargetTypeDrawer(Type type)
             return targetTypeDrawers.ContainsKey(type.IsGenericType ? type.GetGenericTypeDefinition() : type);
         }
 
+        internal static void ForceDefaultLists(bool value)
+        {
+            if (value)
+            {
+                ScriptingUtility.AppendDefine(ToolboxDefines.defaultListsDefine);
+            }
+            else
+            {
+                ScriptingUtility.RemoveDefine(ToolboxDefines.defaultListsDefine);
+            }
+        }
+
         internal static ToolboxDecoratorDrawerBase GetDecoratorDrawer<T>(T attribute) where T : ToolboxDecoratorAttribute
         {
             return GetDecoratorDrawer(attribute.GetType());
@@ -412,7 +430,7 @@ internal static ToolboxPropertyHandler GetPropertyHandler(SerializedProperty pro
 
         //TODO:
         //NOTE: unfortunately there is no valid, non-reflection way to check if property has a custom native drawer
-        private readonly static MethodInfo getDrawerTypeForTypeMethod =
+        private static readonly MethodInfo getDrawerTypeForTypeMethod =
             ReflectionUtility.GetEditorMethod("UnityEditor.ScriptAttributeUtility", "GetDrawerTypeForType",
                 BindingFlags.NonPublic | BindingFlags.Static);
     }

Assets/Editor Toolbox/Editor/ToolboxDrawerModule.cs

@@ -43,6 +43,7 @@ internal interface IToolboxInspectorSettings
         void SetAllPossibleTargetTypeDrawers();
 
         bool UseToolboxDrawers { get; }
+        bool ForceDefaultLists { get; }
 
         List<SerializedType> DecoratorDrawerHandlers { get; }
         List<SerializedType> ConditionDrawerHandlers { get; }
@@ -81,8 +82,11 @@ internal class ToolboxEditorSettings : ScriptableObject, IToolboxGeneralSettings
         [SerializeField, ReorderableList(ListStyle.Boxed)]
         private List<FolderData> customFolders = new List<FolderData>();
 
-        [SerializeField]
+        [SerializeField, Tooltip("Set to false if you don't want to use Toolbox attributes and related features.")]
         private bool useToolboxDrawers = true;
+        [SerializeField, Tooltip("By default, Inspectors will use the built-in version of the list instead of the Toolbox-based one. " +
+            "Keep in mind that built-in properties don't support Toolbox attributes. \n\n Changing this property will recompile the code.")]
+        private bool forceDefaultLists;
 
         [SerializeField, ReorderableList(ListStyle.Boxed), ClassExtends(typeof(ToolboxDecoratorDrawer<>))]
         private List<SerializedType> decoratorDrawerHandlers = new List<SerializedType>();
@@ -327,6 +331,12 @@ public bool UseToolboxDrawers
             set => useToolboxDrawers = value;
         }
 
+        public bool ForceDefaultLists 
+        { 
+            get => forceDefaultLists; 
+            set => forceDefaultLists = value; 
+        }
+
         public List<SerializedType> DecoratorDrawerHandlers
         {
             get => decoratorDrawerHandlers;
@@ -357,7 +367,6 @@ public List<SerializedType> TargetTypeDrawerHandlers
             set => targetTypeDrawerHandlers = value;
         }
 
-
         private static class Defaults
         {
             internal const float largeFolderIconScaleDefault = 0.8f;

Assets/Editor Toolbox/Editor/ToolboxEditorSettings.cs

@@ -26,6 +26,7 @@ internal class ToolboxEditorSettingsEditor : ToolboxEditor
         private SerializedProperty showSelectionsCountProperty;
         private SerializedProperty useToolboxFoldersProperty;
         private SerializedProperty useToolboxDrawersProperty;
+        private SerializedProperty forceDefaultListsProperty;
         private SerializedProperty largeIconScaleProperty;
         private SerializedProperty smallIconScaleProperty;
         private SerializedProperty largeIconPaddingProperty;
@@ -86,6 +87,7 @@ private void OnEnable()
 #endif
             //inspector-related properties
             useToolboxDrawersProperty = serializedObject.FindProperty("useToolboxDrawers");
+            forceDefaultListsProperty = serializedObject.FindProperty("forceDefaultLists");
 
             drawerHandlersLists = new ReorderableListBase[5];
 #if UNITY_2019_3_OR_NEWER
@@ -260,6 +262,9 @@ private void DrawInspectorSettings()
             EditorGUI.BeginChangeCheck();
             EditorGUILayout.Space();
             EditorGUILayout.PropertyField(useToolboxDrawersProperty);
+            EditorGUI.BeginDisabledGroup(!useToolboxDrawersProperty.boolValue);
+            EditorGUILayout.PropertyField(forceDefaultListsProperty);
+            EditorGUI.EndDisabledGroup();
             EditorGUILayout.Space();
 
             var validateInspector = false;

Assets/Editor Toolbox/Editor/ToolboxEditorSettingsEditor.cs

@@ -444,15 +444,23 @@ public void OnGuiDefault(SerializedProperty property)
         /// </summary>
         public void OnGuiDefault(SerializedProperty property, GUIContent label)
         {
+#if TOOLBOX_FORCE_DEFAULT_LISTS
+            if (isArray)
+            {
+                EditorGUILayout.PropertyField(property, label, true);
+                return;
+            }
+#endif
             //all "single" properties and native drawers should be drawn in the native way
             if (hasBuiltInPropertyDrawer)
             {
                 ToolboxEditorGui.DrawNativeProperty(property, label);
-                return;
             }
-
             //handles property in default native way but supports ToolboxDrawers in children
-            ToolboxEditorGui.DrawDefaultProperty(property, label);
+            else
+            {
+                ToolboxEditorGui.DrawDefaultProperty(property, label);
+            }
         }
     }
 }

Assets/Editor Toolbox/Editor/ToolboxPropertyHandler.cs

@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using UnityEditor;
+
+namespace Toolbox.Editor
+{
+    public static class ScriptingUtility
+    {
+        public static List<string> GetDefines()
+        {
+            var defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
+            return defines.Split(';').ToList();
+        }
+
+        public static void SetDefines(List<string> definesList)
+        {
+            var defines = string.Join(";", definesList.ToArray());
+            PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, defines);
+        }
+
+        public static void AppendDefine(string define)
+        {
+            var definesList = GetDefines();
+            if (definesList.Contains(define))
+            {
+                return;
+            }
+
+            definesList.Add(define);
+            SetDefines(definesList);
+        }
+
+        public static void RemoveDefine(string define)
+        {
+            var definesList = GetDefines();
+            if (definesList.RemoveAll(s => s == define) == 0)
+            {
+                return;
+            }
+
+            SetDefines(definesList);
+        }
+    }
+}

Assets/Editor Toolbox/Editor/Utilities/ScriptingUtility.cs

@@ -47,6 +47,7 @@ MonoBehaviour:
     smallIcon: {fileID: 2800000, guid: e99d63b63394eba4aaf10385704d0ef3, type: 3}
     iconName: 
   useToolboxDrawers: 1
+  forceDefaultLists: 0
   decoratorDrawerHandlers:
   - typeReference: Toolbox.Editor.Drawers.BeginGroupAttributeDrawer, Toolbox.Editor
   - typeReference: Toolbox.Editor.Drawers.BeginHorizontalAttributeDrawer, Toolbox.Editor

Assets/Editor Toolbox/Editor/Utilities/ScriptingUtility.cs.meta

@@ -68,6 +68,12 @@ PlayerSettings:
   androidRenderOutsideSafeArea: 0
   androidUseSwappy: 0
   androidBlitType: 0
+  androidResizableWindow: 0
+  androidDefaultWindowWidth: 1920
+  androidDefaultWindowHeight: 1080
+  androidMinimumWindowWidth: 400
+  androidMinimumWindowHeight: 300
+  androidFullscreenMode: 1
   defaultIsNativeResolution: 1
   macRetinaSupport: 1
   runInBackground: 1
@@ -121,6 +127,7 @@ PlayerSettings:
   vulkanEnableSetSRGBWrite: 0
   vulkanEnablePreTransform: 0
   vulkanEnableLateAcquireNextImage: 0
+  vulkanEnableCommandBufferRecycling: 1
   m_SupportedAspectRatios:
     4:3: 1
     5:4: 1
@@ -236,6 +243,7 @@ PlayerSettings:
   useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 5
+  AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: 
@@ -252,6 +260,7 @@ PlayerSettings:
     height: 180
     banner: {fileID: 0}
   androidGamepadSupportLevel: 0
+  chromeosInputEmulation: 1
   AndroidMinifyWithR8: 0
   AndroidMinifyRelease: 0
   AndroidMinifyDebug: 0
@@ -354,6 +363,7 @@ PlayerSettings:
   cameraUsageDescription: 
   locationUsageDescription: 
   microphoneUsageDescription: 
+  bluetoothUsageDescription: 
   switchNMETAOverride: 
   switchNetLibKey: 
   switchSocketMemoryPoolSize: 6144
@@ -491,6 +501,10 @@ PlayerSettings:
   switchNetworkInterfaceManagerInitializeEnabled: 1
   switchPlayerConnectionEnabled: 1
   switchUseNewStyleFilepaths: 0
+  switchUseMicroSleepForYield: 1
+  switchEnableRamDiskSupport: 0
+  switchMicroSleepForYieldTime: 25
+  switchRamDiskSpaceSize: 12
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
@@ -561,6 +575,7 @@ PlayerSettings:
   ps4videoRecordingFeaturesUsed: 0
   ps4contentSearchFeaturesUsed: 0
   ps4CompatibilityPS5: 0
+  ps4AllowPS5Detection: 0
   ps4GPU800MHz: 1
   ps4attribEyeToEyeDistanceSettingVR: 0
   ps4IncludedModules: []
@@ -585,7 +600,8 @@ PlayerSettings:
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
-  scriptingDefineSymbols: {}
+  scriptingDefineSymbols:
+    1: 
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: {}
@@ -632,6 +648,7 @@ PlayerSettings:
   metroFTAName: 
   metroFTAFileTypes: []
   metroProtocolName: 
+  vcxProjDefaultLanguage: 
   XboxOneProductId: 
   XboxOneUpdateKey: 
   XboxOneSandboxId: