negames/SerializeReferenceExtensions-Better
26
0
Fork 0
forked from ThirdPartyPackagesMirrors/Unity-SerializeReferenceExtensions
Code Pull Requests Activity

Merge pull request #49 from JohannesDeml/bugfix/avoid-label-overlap

Browse Source 
Fix label overlapping button
This commit is contained in:
Makihiro 2024-02-16 20:50:55 +09:00 committed by GitHub
commit 69830f3583
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs
View File

@ -35,12 +35,14 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
EditorGUI.BeginProperty(position,label,property);
if (property.propertyType == SerializedPropertyType.ManagedReference) {
// Draw the subclass selector popup.
Rect popupPosition = new Rect(position);
popupPosition.width -= EditorGUIUtility.labelWidth;
popupPosition.x += EditorGUIUtility.labelWidth;
popupPosition.height = EditorGUIUtility.singleLineHeight;
// render label first to avoid label overlap for lists
Rect foldoutLabelRect = new Rect(position);
foldoutLabelRect.height = EditorGUIUtility.singleLineHeight;
foldoutLabelRect.x += EditorGUI.indentLevel * 12;
Rect popupPosition = EditorGUI.PrefixLabel(foldoutLabelRect, label);
// Draw the subclass selector popup.
if (EditorGUI.DropdownButton(popupPosition,GetTypeName(property),FocusType.Keyboard)) {
TypePopupCache popup = GetTypePopup(property);
m_TargetProperty = property;
@ -54,8 +56,8 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
// Draw the property with custom property drawer.
Rect foldoutRect = new Rect(position);
foldoutRect.height = EditorGUIUtility.singleLineHeight;
property.isExpanded = EditorGUI.Foldout(foldoutRect, property.isExpanded, label, true);
property.isExpanded = EditorGUI.Foldout(foldoutRect, property.isExpanded, GUIContent.none, true);
if (property.isExpanded)
{
using (new EditorGUI.IndentLevelScope())
@ -70,7 +72,7 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
}
else
{
EditorGUI.PropertyField(position, property, label, true);
EditorGUI.PropertyField(position, property, GUIContent.none, true);
}
} else {
EditorGUI.LabelField(position,label,k_IsNotManagedReferenceLabel);
@ -95,7 +97,7 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
if (!m_TypePopups.TryGetValue(managedReferenceFieldTypename,out TypePopupCache result)) {
var state = new AdvancedDropdownState();
Type baseType = ManagedReferenceUtility.GetType(managedReferenceFieldTypename);
var popup = new AdvancedTypePopup(
TypeCache.GetTypesDerivedFrom(baseType).Append(baseType).Where(p =>
@ -118,7 +120,7 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
object obj = individualProperty.SetManagedReference(type);
individualProperty.isExpanded = (obj != null);
individualObject.ApplyModifiedProperties();
individualObject.Update();
}