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

Fix regression in collections editing after improving ReadOnly option

Browse Source
This commit is contained in:
Wojtek Figat
2024-05-16 10:34:57 +02:00
parent 58f95d6ce3
commit ab5bb79754
9 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,7 +227,7 @@ namespace FlaxEditor.CustomEditors.Editors
var collection = (CollectionAttribute)attributes?.FirstOrDefault(x => x is CollectionAttribute); var collection = (CollectionAttribute)attributes?.FirstOrDefault(x => x is CollectionAttribute);
if (collection != null) if (collection != null)
{ {
_canResize = !collection.ReadOnly; _canResize = collection.CanResize;
_readOnly = collection.ReadOnly; _readOnly = collection.ReadOnly;
_minCount = collection.MinCount; _minCount = collection.MinCount;
_maxCount = collection.MaxCount; _maxCount = collection.MaxCount;

1
Source/Editor/CustomEditors/Editors/DictionaryEditor.cs
View File

@@ -189,6 +189,7 @@ namespace FlaxEditor.CustomEditors.Editors
var collection = (CollectionAttribute)attributes?.FirstOrDefault(x => x is CollectionAttribute); var collection = (CollectionAttribute)attributes?.FirstOrDefault(x => x is CollectionAttribute);
if (collection != null) if (collection != null)
{ {
_canEditKeys &= collection.CanReorderItems;
_readOnly = collection.ReadOnly; _readOnly = collection.ReadOnly;
_notNullItems = collection.NotNullItems; _notNullItems = collection.NotNullItems;
if (collection.BackgroundColor.HasValue) if (collection.BackgroundColor.HasValue)

2
Source/Editor/GUI/Timeline/Tracks/ConductorTrack.cs
View File

@@ -130,7 +130,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
/// The keyframes. /// The keyframes.
/// </summary> /// </summary>
[EditorDisplay("Keyframes", EditorDisplayAttribute.InlineStyle), ExpandGroups] [EditorDisplay("Keyframes", EditorDisplayAttribute.InlineStyle), ExpandGroups]
[Collection(CanReorderItems = false, ReadOnly = true)] [Collection(CanReorderItems = false, CanResize = true)]
public List<KeyValuePair<string, object>> Keyframes; public List<KeyValuePair<string, object>> Keyframes;
/// <inheritdoc /> /// <inheritdoc />

2
Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
View File

@@ -159,7 +159,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
/// The parameters values. /// The parameters values.
/// </summary> /// </summary>
[EditorDisplay("Parameters", EditorDisplayAttribute.InlineStyle), ExpandGroups] [EditorDisplay("Parameters", EditorDisplayAttribute.InlineStyle), ExpandGroups]
[Collection(CanReorderItems = false, ReadOnly = true)] [Collection(CanReorderItems = false, CanResize = true)]
public object[] Parameters; public object[] Parameters;
/// <inheritdoc /> /// <inheritdoc />

2
Source/Editor/Tools/Foliage/FoliageTypesTab.cs
View File

@@ -82,7 +82,7 @@ namespace FlaxEditor.Tools.Foliage
} }
} }
[EditorOrder(20), EditorDisplay("Model"), Collection(ReadOnly = true), Tooltip("Model materials override collection. Can be used to change a specific material of the mesh to the custom one without editing the asset.")] [EditorOrder(20), EditorDisplay("Model"), Collection(CanResize = true), Tooltip("Model materials override collection. Can be used to change a specific material of the mesh to the custom one without editing the asset.")]
public MaterialBase[] Materials public MaterialBase[] Materials
{ {
get get

2
Source/Engine/Core/Config/LayersAndTagsSettings.cs
View File

@@ -18,7 +18,7 @@ namespace FlaxEditor.Content.Settings
/// <summary> /// <summary>
/// The layers names. /// The layers names.
/// </summary> /// </summary>
[EditorOrder(10), EditorDisplay("Layers", EditorDisplayAttribute.InlineStyle), Collection(ReadOnly = true, Display = CollectionAttribute.DisplayType.Inline)] [EditorOrder(10), EditorDisplay("Layers", EditorDisplayAttribute.InlineStyle), Collection(CanResize = true, Display = CollectionAttribute.DisplayType.Inline)]
public string[] Layers = new string[32]; public string[] Layers = new string[32];
/// <summary> /// <summary>

2
Source/Engine/Level/Actors/BoxBrush.h
View File

@@ -90,7 +90,7 @@ public:
/// <summary> /// <summary>
/// Gets the brush proxies per surface. /// Gets the brush proxies per surface.
/// </summary> /// </summary>
API_PROPERTY(Attributes="Serialize, EditorOrder(100), EditorDisplay(\"Surfaces\", EditorDisplayAttribute.InlineStyle), Collection(CanReorderItems = false, NotNullItems = true, ReadOnly = true)") API_PROPERTY(Attributes="Serialize, EditorOrder(100), EditorDisplay(\"Surfaces\", EditorDisplayAttribute.InlineStyle), Collection(CanReorderItems = false, NotNullItems = true, CanResize = true)")
Array<BrushSurface> GetSurfaces() const; Array<BrushSurface> GetSurfaces() const;
/// <summary> /// <summary>

2
Source/Engine/Level/Actors/ModelInstanceActor.h
View File

@@ -41,7 +41,7 @@ public:
/// <summary> /// <summary>
/// Gets the model entries collection. Each entry contains data how to render meshes using this entry (transformation, material, shadows casting, etc.). /// Gets the model entries collection. Each entry contains data how to render meshes using this entry (transformation, material, shadows casting, etc.).
/// </summary> /// </summary>
API_PROPERTY(Attributes="Serialize, EditorOrder(1000), EditorDisplay(\"Entries\", EditorDisplayAttribute.InlineStyle), Collection(CanReorderItems=false, NotNullItems=true, ReadOnly=true, Spacing=10)") API_PROPERTY(Attributes="Serialize, EditorOrder(1000), EditorDisplay(\"Entries\", EditorDisplayAttribute.InlineStyle), Collection(CanReorderItems=false, NotNullItems=true, CanResize=false, Spacing=10)")
FORCE_INLINE const Array<ModelInstanceEntry>& GetEntries() const FORCE_INLINE const Array<ModelInstanceEntry>& GetEntries() const
{ {
return Entries; return Entries;

5
Source/Engine/Scripting/Attributes/CollectionAttribute.cs
View File

@@ -46,6 +46,11 @@ namespace FlaxEngine
/// </summary> /// </summary>
public bool CanReorderItems = true; public bool CanReorderItems = true;
/// <summary>
/// Gets or sets whether items can be added or removed from this collection.
/// </summary>
public bool CanResize = true;
/// <summary> /// <summary>
/// Gets or sets whether the items of this collection can be null. If <c>true</c>, applications using this collection should prevent user to add null items to the collection. /// Gets or sets whether the items of this collection can be null. If <c>true</c>, applications using this collection should prevent user to add null items to the collection.
/// </summary> /// </summary>