AlicizaX/DragonECS-Unity
1
0
Fork 0
mirror of https://github.com/DCFApixels/DragonECS-Unity.git synced 2025-09-19 02:24:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix display for odin

Browse Source
This commit is contained in:
Mikhail 2024-05-17 00:18:44 +08:00
parent f8a80a0a72
commit 0b5a6a8247
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/EntityTemplate/Editor/ComponentTemplatePropertyDrawer.cs
View File

@ -28,6 +28,7 @@ namespace DCFApixels.DragonECS.Unity.Editors
private static readonly Rect HeadIconsRect = new Rect(0f, 0f, 19f, 19f); private static readonly Rect HeadIconsRect = new Rect(0f, 0f, 19f, 19f);
private float Padding => EditorGUIUtility.standardVerticalSpacing; private float Padding => EditorGUIUtility.standardVerticalSpacing;
private float SingleLineWithPadding => EditorGUIUtility.singleLineHeight + Padding * 4f;
private const float DamagedComponentHeight = 18f * 2f; private const float DamagedComponentHeight = 18f * 2f;
@ -162,7 +163,7 @@ namespace DCFApixels.DragonECS.Unity.Editors
string name = meta.Name; string name = meta.Name;
string description = meta.Description.Text; string description = meta.Description.Text;
int propCount = EcsGUI.GetChildPropertiesCount(componentProperty, componentType, out bool isEmpty); int propCount = EcsGUI.GetChildPropertiesCount(componentProperty);
Color panelColor = EcsGUI.SelectPanelColor(meta, positionCountr, -1).Desaturate(EscEditorConsts.COMPONENT_DRAWER_DESATURATE); Color panelColor = EcsGUI.SelectPanelColor(meta, positionCountr, -1).Desaturate(EscEditorConsts.COMPONENT_DRAWER_DESATURATE);
@ -187,12 +188,10 @@ namespace DCFApixels.DragonECS.Unity.Editors
if (propCount <= 0) if (propCount <= 0)
{ {
label.text = $"{label.text} ({name})"; EcsGUI.DrawEmptyComponentProperty(paddingPosition, componentRefProp, label, false);
EcsGUI.DrawEmptyComponentProperty(paddingPosition, componentRefProp, label.text, isEmpty);
} }
else else
{ {
label.text = $"{label.text} ({name})";
if (componentProperty.propertyType == SerializedPropertyType.Generic) if (componentProperty.propertyType == SerializedPropertyType.Generic)
{ {
EditorGUI.PropertyField(paddingPosition, componentProperty, label, true); EditorGUI.PropertyField(paddingPosition, componentProperty, label, true);
@ -203,6 +202,18 @@ namespace DCFApixels.DragonECS.Unity.Editors
EditorGUI.PropertyField(r, componentProperty, label, true); EditorGUI.PropertyField(r, componentProperty, label, true);
} }
} }
if (string.IsNullOrEmpty(label.text))
{
EditorGUI.indentLevel++;
EditorGUI.PrefixLabel(position.AddPadding(0, 0, 0, position.height - SingleLineWithPadding), UnityEditorUtility.GetLabel(name));
EditorGUI.indentLevel--;
}
else
{
GUI.Label(position.AddPadding(EditorGUIUtility.labelWidth, 0, 0, position.height - SingleLineWithPadding), name);
}
if (isRemoveComponent) if (isRemoveComponent)
{ {
componentRefProp.managedReferenceValue = null; componentRefProp.managedReferenceValue = null;