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

Fixing drawer for generated reference of complex struct type (#155)

Browse Source 
* Adding proposals to fix #153

FIx custom reference doesn't appear properly

* Fix #153

Fix custom reference doesn't appear properly

* Fix #153

Fix custom reference doesn't appear properly

Co-authored-by: Bastien Guyl <bguyl@smart-tale.com>
This commit is contained in:
Bastien Guyl 2020-05-11 20:07:56 +02:00 committed by GitHub
parent 849ae95b58
commit 4aa1f4a4d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Packages/Core/Editor/Drawers/AtomBaseReferenceDrawer.cs
View File

@ -46,6 +46,8 @@ namespace UnityAtoms.Editor
_popupStyle.imagePosition = ImagePosition.ImageOnly;
}
Rect originalPosition = new Rect(position);
label = EditorGUI.BeginProperty(position, label, property);
position = EditorGUI.PrefixLabel(position, label);
@ -72,11 +74,25 @@ namespace UnityAtoms.Editor
int indent = EditorGUI.indentLevel;
EditorGUI.indentLevel = 0;
var newUsagePopupIndex = EditorGUI.Popup(buttonRect, usagePopupIndex, GetPopupOptions(property), _popupStyle);
usage.intValue = GetUsages(property)[newUsagePopupIndex].Value;
EditorGUI.PropertyField(position,
property.FindPropertyRelative(GetUsages(property)[newUsagePopupIndex].PropertyName),
GUIContent.none);
int usageType = GetUsages(property)[newUsagePopupIndex].Value;
usage.intValue = usageType;
SerializedProperty valueProperty =
property.FindPropertyRelative(GetUsages(property)[newUsagePopupIndex].PropertyName);
if (usageType == 0 && valueProperty.hasChildren)
{
EditorGUI.PropertyField(originalPosition,
property.FindPropertyRelative(GetUsages(property)[newUsagePopupIndex].PropertyName),
GUIContent.none, true);
}
else
{
EditorGUI.PropertyField(position,
property.FindPropertyRelative(GetUsages(property)[newUsagePopupIndex].PropertyName),
GUIContent.none);
}
if (EditorGUI.EndChangeCheck())
property.serializedObject.ApplyModifiedProperties();