Skip to content

Fix TooltipAttribute not working and expose TriEditor.OnEnable and TriEditor.OnDisable #144

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
vanifatovvlad merged 1 commit into from
Nov 6, 2023
Merged

Fix TooltipAttribute not working and expose TriEditor.OnEnable and TriEditor.OnDisable #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Editor/Editors/TriEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ public abstract class TriEditor : Editor
{
private TriEditorCore _core;

private void OnEnable()
protected virtual void OnEnable()
{
_core = new TriEditorCore(this);
}

private void OnDisable()
protected virtual void OnDisable()
{
_core.Dispose();
}
Expand Down
9 changes: 7 additions & 2 deletions Editor/Elements/TriLabelElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ public class TriLabelElement : TriElement
{
private readonly GUIContent _label;

public TriLabelElement(string label)
public TriLabelElement(string label, string tooltip = "")
{
_label = new GUIContent(label);
_label = new GUIContent(label, tooltip);
}

public TriLabelElement(GUIContent label)
{
_label = label;
}

public override float GetHeight(float width)
Expand Down
4 changes: 4 additions & 0 deletions Editor/TriPropertyDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ internal TriPropertyDefinition(
{
CustomTooltip = ValueResolver.ResolveString(this, tooltipAttribute.Tooltip);
}
else if (Attributes.TryGet(out TooltipAttribute unityTooltipAttribute))
{
CustomTooltip = new ConstantValueResolver<string>(unityTooltipAttribute.tooltip);
}
}

public Type OwnerType { get; }
Expand Down