fix: Fixed overwritten values when selecting multiple objects

IShix-g · Mar 15, 2024 · 7141a4e · 7141a4e
1 parent e5c34c8
commit 7141a4e
Show file tree

Hide file tree

Showing 23 changed files with 59 additions and 448 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,6 @@ crashlytics-build.properties
 .idea
 Assets/Plugins/Editor
 Assets/Plugins/Editor.meta
+default-2021.dwlt
+EditorUserSettings.asset
+Search.settings
diff --git a/Assets/Plugins/IDReference/Editor/IDReferencePropertyDrawer.cs b/Assets/Plugins/IDReference/Editor/IDReferencePropertyDrawer.cs
@@ -29,10 +29,11 @@ public override void OnGUI (Rect position, SerializedProperty property, GUIConte
                 EditorGUI.PropertyField(position, property, true);
                 var style  = new GUIStyle();
                 style.normal.textColor  = Color.red;
-                EditorGUILayout.TextArea($"{GetTxt(Application.systemLanguage)}{attr.GetAssetPath()}", style);
+                var assetPath = attr != default ? attr.GetAssetPath() : "";
+                EditorGUILayout.TextArea($"{GetTxt(Application.systemLanguage)}{assetPath}", style);
                 return;
             }
-
+            
             var ids = new List<string>();
             var keys = new List<string>();
 
@@ -52,9 +53,9 @@ public override void OnGUI (Rect position, SerializedProperty property, GUIConte
                 keys.Add("Add ID...");
             }
 
+            var popUpLabel = EditorGUI.BeginProperty(position, label, property);
             var curValue = string.IsNullOrEmpty(property.stringValue) ? EmptyID : property.stringValue;
             var optionsArray = ids.Select(o => new GUIContent(o)).ToArray();
-            var popUpLabel = EditorGUI.BeginProperty(position, null, property);
             var curIndex = keys.IndexOf(curValue);
 
             if (curIndex < 0)
@@ -63,6 +64,8 @@ public override void OnGUI (Rect position, SerializedProperty property, GUIConte
                 ids[0] = "*Unknown";
             }
 
+            EditorGUI.BeginChangeCheck();
+
             var newIndex = EditorGUI.Popup(position, popUpLabel, curIndex, optionsArray);
 
             if (!disableDropDownAddKey
@@ -77,8 +80,12 @@ public override void OnGUI (Rect position, SerializedProperty property, GUIConte
             {
                 newValue = string.Empty;
             }
-            property.stringValue = newValue;
-
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                property.stringValue = newValue;
+            }
+
             EditorGUI.EndProperty();
         }
 

diff --git a/Assets/Tests/IDReferenceTest (1) 1.prefab b/Assets/Tests/IDReferenceTest (1) 1.prefab
diff --git a/Assets/Tests/IDReferenceTest (1) 1.prefab.meta b/Assets/Tests/IDReferenceTest (1) 1.prefab.meta
diff --git a/Assets/Tests/IDReferenceTest (1) 2.prefab b/Assets/Tests/IDReferenceTest (1) 2.prefab
diff --git a/Assets/Tests/IDReferenceTest (1) 3.prefab b/Assets/Tests/IDReferenceTest (1) 3.prefab
diff --git a/Assets/Tests/IDReferenceTest (1) 3.prefab.meta b/Assets/Tests/IDReferenceTest (1) 3.prefab.meta
diff --git a/Assets/Tests/IDReferenceTest (1) 4.prefab.meta b/Assets/Tests/IDReferenceTest (1) 4.prefab.meta
diff --git a/Assets/Tests/IDReferenceTest (1) 5.prefab b/Assets/Tests/IDReferenceTest (1) 5.prefab
diff --git a/Assets/Tests/IDReferenceTest (1) 5.prefab.meta b/Assets/Tests/IDReferenceTest (1) 5.prefab.meta
diff --git a/Assets/Tests/IDReferenceTest (1) 6.prefab b/Assets/Tests/IDReferenceTest (1) 6.prefab
diff --git a/Assets/Tests/IDReferenceTest (1) 6.prefab.meta b/Assets/Tests/IDReferenceTest (1) 6.prefab.meta
diff --git a/Assets/Tests/IDReferenceTest (1) 7.prefab b/Assets/Tests/IDReferenceTest (1) 7.prefab
diff --git a/Assets/Tests/IDReferenceTest (1) 7.prefab.meta b/Assets/Tests/IDReferenceTest (1) 7.prefab.meta