caleb-brown/Alchemy
1
0
Fork 0
mirror of https://github.com/AnnulusGames/Alchemy.git synced 2025-01-22 08:18:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20 from AnnulusGames/fix-inlineditor-array

Browse Source 
Fix: InlineEditor attribute doesn't work for arrays
This commit is contained in:
Annulus Games 2024-02-16 22:35:43 +09:00 committed by GitHub
commit 513e278b74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Alchemy/Assets/Alchemy/Editor/Elements/InlineEditorObjectField.cs
View File

@ -15,6 +15,8 @@ namespace Alchemy.Editor.Elements
{
Assert.IsTrue(property.propertyType == SerializedPropertyType.ObjectReference);
this.depth = depth;
style.minHeight = EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
foldout = new Foldout()
@ -31,29 +33,19 @@ namespace Alchemy.Editor.Elements
field.style.position = Position.Absolute;
field.style.width = Length.Percent(100f);
field.RegisterValueChangeCallback(x =>
field.schedule.Execute(() =>
{
isNull = x.changedProperty.objectReferenceValue == null;
if (!isNull) field.Q<Label>().text = string.Empty;
else field.Q<Label>().text = ObjectNames.NicifyVariableName(property.displayName);
field.pickingMode = PickingMode.Ignore;
var objectField = field.Q<ObjectField>();
objectField.pickingMode = PickingMode.Ignore;
var label = objectField.Q<Label>();
label.pickingMode = PickingMode.Ignore;
Build(x.changedProperty, depth);
OnPropertyChanged(property);
field.RegisterValueChangeCallback(x => OnPropertyChanged(x.changedProperty));
});
Add(foldout);
Add(field);
Build(property, depth);
}
readonly Foldout foldout;
readonly PropertyField field;
readonly int depth;
bool isNull;
public bool IsObjectNull => isNull;
@ -72,7 +64,23 @@ namespace Alchemy.Editor.Elements
}
}
void Build(SerializedProperty property, int depth)
void OnPropertyChanged(SerializedProperty property)
{
isNull = property.objectReferenceValue == null;
field.Q<Label>().text = isNull ? ObjectNames.NicifyVariableName(property.displayName) : string.Empty;
field.pickingMode = PickingMode.Ignore;
var objectField = field.Q<ObjectField>();
objectField.pickingMode = PickingMode.Ignore;
var label = objectField.Q<Label>();
label.pickingMode = PickingMode.Ignore;
Build(property);
}
void Build(SerializedProperty property)
{
foldout.Clear();
var toggle = foldout.Q<Toggle>();