Skip to content

Required Property default text to use label #280

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

Open
Treidexy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Required Property default text to use label #280

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
8 changes: 7 additions & 1 deletion Assets/NaughtyAttributes/Scripts/Editor/PropertyValidators/RequiredPropertyValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using UnityEditor;

using static NaughtyAttributes.Editor.PropertyUtility;

namespace NaughtyAttributes.Editor
{
public class RequiredPropertyValidator : PropertyValidatorBase
Expand All @@ -12,7 +14,11 @@ public override void ValidateProperty(SerializedProperty property)
{
if (property.objectReferenceValue == null)
{
string errorMessage = property.name + " is required";
LabelAttribute labelAttribute = GetAttribute<LabelAttribute>(property);
string labelText = (labelAttribute == null)
? property.displayName
: labelAttribute.Label;
string errorMessage = labelText + " is required";
if (!string.IsNullOrEmpty(requiredAttribute.Message))
{
errorMessage = requiredAttribute.Message;
Expand Down