GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix name (was causing docs build warning)

Browse Source
This commit is contained in:
Wojtek Figat
2021-01-25 23:52:07 +01:00
parent f6085c7479
commit 5b4dbfa121
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/CustomEditors/Editors/ActorStaticFlagsEditor.cs
View File

@@ -23,7 +23,7 @@ namespace FlaxEditor.CustomEditors.Editors
/// <inheritdoc />
protected override void OnValueChanged()
{
var value = (StaticFlags)element.EnumComboBox.EnumTypeValue;
var value = (StaticFlags)element.ComboBox.EnumTypeValue;
// If selected is single actor that has children, ask if apply flags to the sub objects as well
if (Values.IsSingleObject && (StaticFlags)Values[0] != value && ParentEditor.Values[0] is Actor actor && actor.HasChildren)

6
Source/Editor/CustomEditors/Editors/EnumEditor.cs
View File

@@ -40,7 +40,7 @@ namespace FlaxEditor.CustomEditors.Editors
{
var enumType = Values.Type.Type != typeof(object) || Values[0] == null ? TypeUtils.GetType(Values.Type) : Values[0].GetType();
element = layout.Enum(enumType, null, mode);
element.EnumComboBox.ValueChanged += OnValueChanged;
element.ComboBox.ValueChanged += OnValueChanged;
}
}
@@ -49,7 +49,7 @@ namespace FlaxEditor.CustomEditors.Editors
/// </summary>
protected virtual void OnValueChanged()
{
SetValue(element.EnumComboBox.EnumTypeValue);
SetValue(element.ComboBox.EnumTypeValue);
}
/// <inheritdoc />
@@ -63,7 +63,7 @@ namespace FlaxEditor.CustomEditors.Editors
}
else
{
element.EnumComboBox.EnumTypeValue = Values[0];
element.ComboBox.EnumTypeValue = Values[0];
}
}
}

6
Source/Editor/CustomEditors/Elements/EnumElement.cs
View File

@@ -16,7 +16,7 @@ namespace FlaxEditor.CustomEditors.Elements
/// <summary>
/// The combo box used to show enum values.
/// </summary>
public EnumComboBox EnumComboBox;
public EnumComboBox ComboBox;
/// <summary>
/// Initializes a new instance of the <see cref="EnumElement"/> class.
@@ -26,10 +26,10 @@ namespace FlaxEditor.CustomEditors.Elements
/// <param name="formatMode">The formatting mode.</param>
public EnumElement(Type type, EnumComboBox.BuildEntriesDelegate customBuildEntriesDelegate = null, EnumDisplayAttribute.FormatMode formatMode = EnumDisplayAttribute.FormatMode.Default)
{
EnumComboBox = new EnumComboBox(type, customBuildEntriesDelegate, formatMode);
ComboBox = new EnumComboBox(type, customBuildEntriesDelegate, formatMode);
}
/// <inheritdoc />
public override Control Control => EnumComboBox;
public override Control Control => ComboBox;
}
}