Skip to content
This repository was archived by the owner on Jul 30, 2020. It is now read-only.

Fix for #215 - Push/Pop imbalance #216

Open
gjroelofs wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for #215 - Push/Pop imbalance #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b28416
Fix Push/Pop LabelWidth imbalance IBehaviorEditor
gjroelofs Oct 5, 2018
de11153
Fix Push/Pop LabelWidth Imbalance IPropertyEditor
gjroelofs Oct 5, 2018
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
3 changes: 2 additions & 1 deletion Assets/FullInspector2/Core/Editor/IBehaviorEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public void Edit(Rect rect, UnityObject behavior) {
// Run the editor
OnEdit(rect, (TBehavior)behavior, fiPersistentMetadata.GetMetadataFor(behavior));

fiGUI.PopLabelWidth();
EditorGUIUtility.labelWidth = savedLabelWidth;

// If the GUI has been changed, then we want to reserialize the
Expand All @@ -102,4 +103,4 @@ public float GetHeight(UnityObject behavior) {
return OnGetHeight((TBehavior)behavior, fiPersistentMetadata.GetMetadataFor(behavior));
}
}
}
}
3 changes: 2 additions & 1 deletion Assets/FullInspector2/Core/Editor/IPropertyEditorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public static T Edit<T>(this IPropertyEditor editor, Rect region, GUIContent lab
if (typeof(T).IsPrimitive) result = DoEditFast(api, region, label, element, metadata.Metadata);
else result = DoEditSlow(api, region, label, element, metadata.Metadata);

fiGUI.PopLabelWidth();
EditorGUIUtility.labelWidth = currentLabeWidth;

return result;
Expand Down Expand Up @@ -325,4 +326,4 @@ public static T EditWithGUILayout<T>(this IPropertyEditor editor, GUIContent lab
return element;
}
}
}
}