com.wallstop-studios.unity-helpers 2.0.0-rc76.5 → 2.0.0-rc76.6

package/Editor/CustomEditors/PersistentDirectoryGUI.cs

@@ -620,7 +620,10 @@
                                 }
                             }
                         }
-                        catch { }
+                        catch
+                        {
+                            // Swalllow
+                        }
                     }
                     if (!Directory.Exists(initialBrowsePath))
                     {

package/Editor/CustomEditors/SourceFolderEntryDrawer.cs

@@ -38,9 +38,6 @@
                 SerializedProperty folderPathProp = property.FindPropertyRelative(
                     nameof(SourceFolderEntry.folderPath)
                 );
-                SerializedProperty regexesProp = property.FindPropertyRelative(
-                    nameof(SourceFolderEntry.regexes)
-                );
 
                 Rect folderPathLabelRect = new(
                     startX,
@@ -153,48 +150,63 @@
 
                 if (RegexesFoldoutState[regexesFoldoutKey])
                 {
-                    int listElementIndentLvl = EditorGUI.indentLevel;
-                    EditorGUI.indentLevel++;
-                    float regexStartX = startX + 15f;
-                    float regexAvailableWidth = availableWidth - 15f;
-                    Rect sizeFieldRect = new(
-                        regexStartX,
-                        currentY,
-                        regexAvailableWidth,
-                        EditorGUIUtility.singleLineHeight
+                    SerializedProperty regexesProp = property.FindPropertyRelative(
+                        nameof(SourceFolderEntry.regexes)
                     );
-
-                    EditorGUI.BeginChangeCheck();
-                    int newSize = EditorGUI.IntField(sizeFieldRect, "Size", regexesProp.arraySize);
-                    if (EditorGUI.EndChangeCheck())
-                    {
-                        newSize = Mathf.Max(0, newSize);
-                        regexesProp.arraySize = newSize;
-                    }
-                    currentY += sizeFieldRect.height + EditorGUIUtility.standardVerticalSpacing;
+                    float regexStartX = startX + 15f;
+                    float regexWidth = availableWidth - 15f;
 
                     for (int i = 0; i < regexesProp.arraySize; i++)
                     {
-                        SerializedProperty elementProp = regexesProp.GetArrayElementAtIndex(i);
-                        Rect elementRect = new(
+                        SerializedProperty elemProp = regexesProp.GetArrayElementAtIndex(i);
+                        Rect fieldRect = new(
                             regexStartX,
                             currentY,
-                            regexAvailableWidth,
+                            regexWidth - 25f,
                             EditorGUIUtility.singleLineHeight
                         );
                         EditorGUI.BeginChangeCheck();
-                        string newStringValue = EditorGUI.TextField(
-                            elementRect,
-                            $"Element {i}",
-                            elementProp.stringValue
+                        string newVal = EditorGUI.TextField(
+                            fieldRect,
+                            $"Regex {i}:",
+                            elemProp.stringValue
                         );
                         if (EditorGUI.EndChangeCheck())
                         {
-                            elementProp.stringValue = newStringValue;
+                            elemProp.stringValue = newVal;
+                        }
+
+                        Rect remRect = new(
+                            fieldRect.xMax + 4f,
+                            currentY,
+                            25f,
+                            EditorGUIUtility.singleLineHeight
+                        );
+                        if (GUI.Button(remRect, "–"))
+                        {
+                            regexesProp.DeleteArrayElementAtIndex(i);
+                            property.serializedObject.ApplyModifiedProperties();
                         }
-                        currentY += elementRect.height + EditorGUIUtility.standardVerticalSpacing;
+
+                        currentY +=
+                            EditorGUIUtility.singleLineHeight
+                            + EditorGUIUtility.standardVerticalSpacing;
+                    }
+
+                    Rect addRect = new(
+                        regexStartX,
+                        currentY,
+                        regexWidth,
+                        EditorGUIUtility.singleLineHeight
+                    );
+
+                    if (GUI.Button(addRect, "+ Add Regex"))
+                    {
+                        int idx = regexesProp.arraySize;
+                        regexesProp.InsertArrayElementAtIndex(idx);
+                        regexesProp.GetArrayElementAtIndex(idx).stringValue = string.Empty;
+                        property.serializedObject.ApplyModifiedProperties();
                     }
-                    EditorGUI.indentLevel = listElementIndentLvl;
                 }
                 EditorGUI.indentLevel = originalIndent;
             }

package/Editor/Sprites/ScriptableSpriteAtlasEditor.cs

@@ -16,6 +16,8 @@
 
     public sealed class ScriptableSpriteAtlasEditor : EditorWindow
     {
+        private readonly Dictionary<ScriptableSpriteAtlas, SerializedObject> _serializedConfigs =
+            new();
         private List<ScriptableSpriteAtlas> _atlasConfigs = new();
         private Vector2 _scrollPosition;
 
@@ -58,6 +60,7 @@
             Dictionary<ScriptableSpriteAtlas, ScanResult> existingScanCache = new(
                 _scanResultsCache
             );
+            _serializedConfigs.Clear();
             _scanResultsCache.Clear();
 
             string[] guids = AssetDatabase.FindAssets("t:ScriptableSpriteAtlas");
@@ -78,6 +81,7 @@
                     {
                         _scanResultsCache[config] = new ScanResult();
                     }
+                    _serializedConfigs.TryAdd(config, newConfig => new SerializedObject(newConfig));
                     _foldoutStates.TryAdd(config, true);
                 }
             }
@@ -155,7 +159,10 @@
                 if (_foldoutStates[config])
                 {
                     using EditorGUI.IndentLevelScope indentScope = new();
-                    SerializedObject serializedConfig = new(config);
+                    SerializedObject serializedConfig = _serializedConfigs.GetOrAdd(
+                        config,
+                        newConfig => new SerializedObject(newConfig)
+                    );
                     serializedConfig.Update();
                     EditorGUI.BeginChangeCheck();
 
@@ -169,6 +176,7 @@
                     );
                     if (EditorGUI.EndChangeCheck())
                     {
+                        serializedConfig.ApplyModifiedProperties();
                         if (
                             !string.IsNullOrWhiteSpace(newAssetName)
                             && newAssetName != currentAssetName