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

Fix value field height in reference drawer for older Unity versions (#447)

Browse Source 
* Fix value field height in reference drawer for older unity versions

* Fix property height for quaternions

* Fix property field height for quaternions in variable editor as well

* Fix comment
This commit is contained in:
Adam Ramberg 2023-12-19 00:38:03 +01:00 committed by GitHub
parent 53bc009865
commit 4576277a19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,14 @@ namespace UnityAtoms.Editor
var innerProperty = property.FindPropertyRelative(usageData.PropertyName);
return innerProperty == null ?
bool forceSingleLine = false;
#if UNITY_2021_2_OR_NEWER
// This is needed for similar reasons as described in the comment in the DrawField method below.
// This is basically a hack to fix a bug on Unity's side, which we need to revert when / if Unity fix it on their side.
forceSingleLine = innerProperty != null && innerProperty.propertyType == SerializedPropertyType.Quaternion;
#endif
return innerProperty == null || forceSingleLine ?
EditorGUIUtility.singleLineHeight :
EditorGUI.GetPropertyHeight(innerProperty, label);
}
@ -109,12 +116,16 @@ namespace UnityAtoms.Editor
{
var expanded = usageTypeProperty.isExpanded;
usageTypeProperty.isExpanded = true;
#if UNITY_2021_2_OR_NEWER
var valueFieldHeight = usageTypeProperty.propertyType == SerializedPropertyType.Quaternion ?
// In versions prior to 2022.3 GetPropertyHeight returns the wrong value for "SerializedPropertyType.Quaternion"
// In later versions, the fix is introduced _but only_ when using the SerializedPropertyType parameter, not when using the SerializedProperty parameter version.
// ALSO the SerializedPropertyType parameter version does not work with the isExpanded flag which we set to true exactly for this reason a (few) lines above.
EditorGUI.GetPropertyHeight(SerializedPropertyType.Vector3, guiData.Label) :
EditorGUI.GetPropertyHeight(usageTypeProperty, guiData.Label);
#else
var valueFieldHeight = EditorGUI.GetPropertyHeight(usageTypeProperty, guiData.Label);
#endif
usageTypeProperty.isExpanded = expanded;

13
Packages/Core/Editor/Editors/Variables/AtomVariableEditor.cs
View File

@ -25,7 +25,18 @@ namespace UnityAtoms.Editor
}
else
{
EditorGUILayout.PropertyField(property, true);
// Quaternion property height is not handled correctly by Unity in version
// 2021.2 and above. Taking that into account here.
#if UNITY_2021_2_OR_NEWER
if (property.propertyType == SerializedPropertyType.Quaternion)
{
EditorGUILayout.PropertyField(property, false);
}
else
#endif
{
EditorGUILayout.PropertyField(property, true);
}
}
}