Skip to content

Fix label overlapping button #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mackysoft merged 2 commits into from
Feb 16, 2024
Merged

Fix label overlapping button #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8bcece
Fix label overlapping button
JohannesDeml Jan 17, 2024
c9b5193
Fix use prefixLabel position right away
JohannesDeml Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ public override void OnGUI (Rect position,SerializedProperty property,GUIContent
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;
Expand All @@ -54,8 +56,8 @@ public override void OnGUI (Rect position,SerializedProperty property,GUIContent
// 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())
Expand All @@ -70,7 +72,7 @@ public override void OnGUI (Rect position,SerializedProperty property,GUIContent
}
else
{
EditorGUI.PropertyField(position, property, label, true);
EditorGUI.PropertyField(position, property, GUIContent.none, true);
}
} else {
EditorGUI.LabelField(position,label,k_IsNotManagedReferenceLabel);
Expand All @@ -95,7 +97,7 @@ TypePopupCache GetTypePopup (SerializedProperty property) {

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 =>
Expand All @@ -118,7 +120,7 @@ TypePopupCache GetTypePopup (SerializedProperty property) {

object obj = individualProperty.SetManagedReference(type);
individualProperty.isExpanded = (obj != null);

individualObject.ApplyModifiedProperties();
individualObject.Update();
}
Expand Down