version 2.0.0

Added

- Main toolbar elements field and property serialization, using SerializeAttribute and calling InitializeElement method if it exists
- Recommended styles for: Vector2Field, Vector3Field, ColorField, LayerField, EnumField, EnumFlagsField, TagField and ObjectField
- Ids for native elements on Unity 6
- ObjectSelector, SearchPickerWindow and EditorGenericDropdownMenuWindowContent won't make group popup close
- Support for Mac (mostly)

Changed

- Breaking: Overrides and some stats saved by control panel window are now saved under UserSettings folder
- Breaking: Set AutoReferenced to false on assembly definition
- Breaking: Added new dependency Unity serialization (while being AutoReferenced)

Removed

- Newtonsoft Json.Net dependency
- Delete actions. Just remove UserSettings/unity-toolbar-extender-ui-toolkit/ files to remove the thing you want

Author: Sammmte

Assets/Package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [2.0.0]
+
+### Added
+
+- Main toolbar elements field and property serialization, using SerializeAttribute and calling InitializeElement method if it exists
+- Recommended styles for: Vector2Field, Vector3Field, ColorField, LayerField, EnumField, EnumFlagsField, TagField and ObjectField
+- Ids for native elements on Unity 6
+- ObjectSelector, SearchPickerWindow and EditorGenericDropdownMenuWindowContent won't make group popup close
+- Support for Mac (mostly)
+
+### Changed
+
+- **Breaking:** Overrides and some stats saved by control panel window are now saved under UserSettings folder
+- **Breaking:** Set AutoReferenced to false on assembly definition
+- **Breaking:** Added new dependency Unity serialization (while being AutoReferenced)
+
+### Removed
+
+- Newtonsoft Json.Net dependency
+- Delete actions. Just remove UserSettings/unity-toolbar-extender-ui-toolkit/ files to remove the thing you want
+
 ## [1.0.1]
 
 ### Fixed

Assets/Package/Editor/ControlPanelWindow/MainToolbarElementController.cs

@@ -53,12 +53,12 @@ public MainToolbarElementController(OverridableElement overridableElement,
 
         private void SaveFoldoutState(ChangeEvent<bool> eventArgs)
         {
-            JsonEditorPrefs.SetBool(GetFullFoldoutStateSaveKey(), eventArgs.newValue);
+            UserSettingsPrefs.SetBool(GetFullFoldoutStateSaveKey(), eventArgs.newValue);
         }
 
         private bool GetSavedFoldoutState()
         {
-            return JsonEditorPrefs.GetBool(GetFullFoldoutStateSaveKey(), false);
+            return UserSettingsPrefs.GetBool(GetFullFoldoutStateSaveKey(), false);
         }
 
         public bool ContainsSubController(string id)

Assets/Package/Editor/ControlPanelWindow/OrganizationalFoldableContainer.cs

@@ -30,12 +30,12 @@ public OrganizationalFoldableContainer(string containerId, string foldoutText)
 
         private void SaveFoldoutState(ChangeEvent<bool> eventArgs)
         {
-            JsonEditorPrefs.SetBool(GetFullFoldoutStateSaveKey(), eventArgs.newValue);
+            UserSettingsPrefs.SetBool(GetFullFoldoutStateSaveKey(), eventArgs.newValue);
         }
 
         private bool GetSavedFoldoutState()
         {
-            return JsonEditorPrefs.GetBool(GetFullFoldoutStateSaveKey(), false);
+            return UserSettingsPrefs.GetBool(GetFullFoldoutStateSaveKey(), false);
         }
 
         public void SetControllers(IEnumerable<MainToolbarElementController> controllers)

Assets/Package/Editor/GroupDefinitions/GroupDropdownWindowPopupManager.cs

@@ -12,6 +12,17 @@ namespace Paps.UnityToolbarExtenderUIToolkit
     internal static class GroupDropdownWindowPopupManager
     {
         private const string POPUP_WINDOW_CONTENT_FIELD_NAME = "m_WindowContent";
+        private static readonly string[] SPECIAL_EDITOR_WINDOW_TYPE_NAMES =
+        {
+            "UnityEditor.UIElements.Debugger.UIElementsDebugger",
+            "UnityEditor.UIElements.EditorMenuExtensions+ContextMenu",
+            "UnityEditor.ObjectSelector",
+            "UnityEditor.Search.SearchPickerWindow"
+        };
+        private static readonly string[] SPECIAL_POPUP_WINDOW_CONTENT_TYPE_NAMES =
+        {
+            "UnityEditor.UIElements.EditorGenericDropdownMenuWindowContent"
+        };
 
         private static FieldInfo _popupWindowContentField;
         private static Type[] _subWindowTypes = new Type[0];
@@ -40,14 +51,11 @@ private static void InitializeSpecialWindowTypes()
         {
             var typeList = new List<Type>();
 
-            var uiToolkitDebuggerType = TypeCache.GetTypesDerivedFrom<EditorWindow>()
-                .FirstOrDefault(type => type.Name == "UIElementsDebugger");
+            typeList.AddRange(TypeCache.GetTypesDerivedFrom<EditorWindow>()
+                .Where(type => SPECIAL_EDITOR_WINDOW_TYPE_NAMES.Contains(type.Name) || SPECIAL_EDITOR_WINDOW_TYPE_NAMES.Contains(type.FullName)));
 
-            var contextMenuType = TypeCache.GetTypesDerivedFrom<EditorWindow>()
-                .FirstOrDefault(type => type.FullName == "UnityEditor.UIElements.EditorMenuExtensions+ContextMenu");
-
-            typeList.Add(uiToolkitDebuggerType);
-            typeList.Add(contextMenuType);
+            typeList.AddRange(TypeCache.GetTypesDerivedFrom<PopupWindowContent>()
+                .Where(type => SPECIAL_POPUP_WINDOW_CONTENT_TYPE_NAMES.Contains(type.Name) || SPECIAL_POPUP_WINDOW_CONTENT_TYPE_NAMES.Contains(type.FullName)));
 
             _specialWindowTypes = typeList.Where(t => t != null).ToArray();
         }
@@ -66,7 +74,7 @@ private static bool ContainsValidPopupWindowContent(EditorWindow window)
 
                 var popupContentSpecificType = popupContent.GetType();
 
-                return _subWindowTypes.Contains(popupContentSpecificType);
+                return _subWindowTypes.Contains(popupContentSpecificType) || _specialWindowTypes.Contains(popupContentSpecificType);
             }
 
             return false;
@@ -124,7 +132,13 @@ public static void Show(Rect activatorRect, VisualElement[] elements)
             _windows.Add(window);
 
             window.Initialize(elements);
+
+#if UNITY_EDITOR_WIN
             window.ShowPopup();
+#elif UNITY_EDITOR_OSX
+            window.ShowAsDropdownForMainToolbar(activatorRect, window.position.size);
+#endif
+    
         }
     }
 }

Assets/Package/Editor/Helpers/GlobalActions.cs

@@ -22,24 +22,6 @@ public static void ResetOverridesIfUserAccepts()
                 );
         }
 
-        public static void DeleteEditorPrefs()
-        {
-            ServicesAndRepositories.MainToolbarElementOverridesRepository.Clear();
-            JsonEditorPrefs.DeleteAll();
-            MainToolbarAutomaticExtender.Refresh();
-        }
-
-        public static void DeleteEditorPrefsIfUserAccepts()
-        {
-            ShowDialog(
-                "Delete Package Related Editor Prefs",
-                $"You are about to delete all Editor Prefs related to {ToolInfo.FRIENDLY_TOOL_NAME}.\nAre you sure you want to continue?",
-                "Delete",
-                "Cancel",
-                DeleteEditorPrefs
-                );
-        }
-
         public static void ShowDialog(string title, string message, string okMessage,
             string cancelMessage, Action onOk = null, Action onCancel = null)
         {

Assets/Package/Editor/Helpers/MenuItems.cs

@@ -15,17 +15,5 @@ public static void OpenControlPanel()
         {
             MainToolbarControlPanelWindow.OpenWindow();
         }
-
-        [MenuItem(ToolInfo.EDITOR_MENU_BASE + "/Delete Actions/Reset Overrides", priority = 23)]
-        public static void ResetOverrides()
-        {
-            GlobalActions.ResetOverridesIfUserAccepts();
-        }
-
-        [MenuItem(ToolInfo.EDITOR_MENU_BASE + "/Delete Actions/Delete Package Related EditorPrefs", priority = 23)]
-        public static void DeletePackageRelatedEditorPrefs()
-        {
-            GlobalActions.DeleteEditorPrefsIfUserAccepts();
-        }
     }
 }

Assets/Package/Editor/Helpers/ServicesAndRepositories.cs

@@ -3,12 +3,21 @@
     internal static class ServicesAndRepositories
     {
         public static IMainToolbarElementOverrideRepository MainToolbarElementOverridesRepository =
-            new JsonEditorPrefsMainToolbarElementOverrideRepository();
+            new UserSettingsFileMainToolbarElementOverrideRepository();
 
         public static IGroupDefinitionRepository GroupDefinitionRepository =
             new ScriptableObjectGroupDefinitionRepository();
 
         public static IMainToolbarElementRepository MainToolbarElementRepository =
             new ByAttributeMainToolbarElementRepository();
+
+        public static IValueSerializer ValueSerializer =
+            new UnitySerializationValueSerializer();
+
+        public static IMainToolbarElementVariableSerializer MainToolbarElementVariableSerializer =
+            new UnitySerializationMainToolbarElementVariableSerializer(ValueSerializer);
+
+        public static IMainToolbarElementVariableRepository MainToolbarElementVariableRepository =
+            new UserSettingsFileMainToolbarElementVariableRepository(MainToolbarElementVariableSerializer);
     }
 }

Assets/Package/Editor/Helpers/UnityNativeElementsIds.cs

@@ -25,6 +25,7 @@ internal static class UnityNativeElementsIds
         // ------------------- ELEMENTS NAMES ---------------------
 
         // LEFT
+        private const string TOOLBAR_PRODUCT_CAPTION_NAME = "ToolbarProductCaption";
         private const string ACCOUNT_DROPDOWN_ELEMENT_NAME = "AccountDropdown";
         private const string CLOUD_BUTTON_ELEMENT_NAME = "Cloud";
 
@@ -43,6 +44,7 @@ internal static class UnityNativeElementsIds
         // ------------------- FIXED IDS ---------------------
 
         // LEFT
+        public const string TOOLBAR_PRODUCT_CAPTION = "ToolbarProductCaption";
         public const string ACCOUNT_DROPDOWN_ID = "AccountDropdown";
         public const string CLOUD_BUTTON_ID = "CloudButton";
         public const string VERSION_CONTROL_ID = "VersionControlButton";
@@ -83,6 +85,7 @@ internal static class UnityNativeElementsIds
         private static readonly Dictionary<string, string> IDS_BY_NAME = new Dictionary<string, string>()
         {
             // LEFT
+            { TOOLBAR_PRODUCT_CAPTION_NAME, TOOLBAR_PRODUCT_CAPTION },
             { ACCOUNT_DROPDOWN_ELEMENT_NAME, ACCOUNT_DROPDOWN_ID },
             { CLOUD_BUTTON_ELEMENT_NAME, CLOUD_BUTTON_ID },
 

Assets/Package/Editor/Helpers/UserSettingsPrefs.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Unity.Serialization.Json;
+using UnityEngine;
+
+namespace Paps.UnityToolbarExtenderUIToolkit
+{
+    public static class UserSettingsPrefs
+    {
+        private static readonly string DIRECTORY = Path.Combine(Directory.GetParent(Application.dataPath).FullName, "UserSettings/", "unity-toolbar-extender-ui-toolkit", "user-settings-prefs");
+        private static readonly string FILE = Path.Combine(DIRECTORY, "user-settings-prefs.json");
+
+        private static Dictionary<string, object> _prefs;
+        private static Dictionary<string, object> Prefs
+        {
+            get
+            {
+                if (_prefs == null)
+                    _prefs = Load();
+
+                return _prefs;
+            }
+        }
+
+        public static void SetInt(string key, int value)
+        {
+            Prefs[key] = value;
+            Save();
+        }
+
+        public static void SetFloat(string key, float value)
+        {
+            Prefs[key] = value;
+            Save();
+        }
+
+        public static void SetDouble(string key, double value)
+        {
+            Prefs[key] = value;
+            Save();
+        }
+
+        public static void SetBool(string key, bool value)
+        {
+            Prefs[key] = value;
+            Save();
+        }
+
+        public static void SetString(string key, string value)
+        {
+            Prefs[key] = value;
+            Save();
+        }
+
+        public static string GetString(string key, string defaultValue = null)
+        {
+            if (Prefs.ContainsKey(key))
+                return (string)Prefs[key];
+
+            return defaultValue;
+        }
+
+        public static bool GetBool(string key, bool defaultValue = false)
+        {
+            if (Prefs.ContainsKey(key))
+                return (bool)Prefs[key];
+
+            return defaultValue;
+        }
+
+        public static int GetInt(string key, int defaultValue = 0)
+        {
+            if (Prefs.ContainsKey(key))
+                return Convert.ToInt32(Prefs[key]);
+
+            return defaultValue;
+        }
+
+        public static float GetFloat(string key, float defaultValue = 0.0f)
+        {
+            if (Prefs.ContainsKey(key))
+                return Convert.ToSingle(Prefs[key]);
+
+            return defaultValue;
+        }
+
+        public static double GetDouble(string key, double defaultValue = 0.0)
+        {
+            if (Prefs.ContainsKey(key))
+                return Convert.ToDouble(Prefs[key]);
+
+            return defaultValue;
+        }
+
+        private static Dictionary<string, object> Load()
+        {
+            if (!Directory.Exists(DIRECTORY))
+                Directory.CreateDirectory(DIRECTORY);
+
+            if (!File.Exists(FILE))
+                return JsonSerialization.FromJson<Dictionary<string, object>>("{}");
+
+            var json = File.ReadAllText(FILE);
+
+            var serializedDictionary = JsonSerialization.FromJson<Dictionary<string, object>>(json);
+
+            return serializedDictionary;
+        }
+
+        private static void Save()
+        {
+            var json = JsonSerialization.ToJson(Prefs);
+
+            File.WriteAllText(FILE, json);
+        }
+    }
+}