diff --git a/Source/Editor/CustomEditors/Editors/ArrayEditor.cs b/Source/Editor/CustomEditors/Editors/ArrayEditor.cs
index 41ca6ba86..af7bff167 100644
--- a/Source/Editor/CustomEditors/Editors/ArrayEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/ArrayEditor.cs
@@ -52,7 +52,7 @@ namespace FlaxEditor.CustomEditors.Editors
else
{
// Initialize new entries with default values
- var defaultValue = TypeUtils.GetDefaultValue(new ScriptType(elementType));
+ var defaultValue = TypeUtils.GetDefaultValue(new ScriptType(elementType), NotNullItems);
for (int i = oldSize; i < newSize; i++)
newValues.SetValue(defaultValue, i);
}
@@ -60,7 +60,7 @@ namespace FlaxEditor.CustomEditors.Editors
else if (newSize > 0)
{
// Initialize new entries with default values
- var defaultValue = TypeUtils.GetDefaultValue(new ScriptType(elementType));
+ var defaultValue = TypeUtils.GetDefaultValue(new ScriptType(elementType), NotNullItems);
for (int i = 0; i < newSize; i++)
newValues.SetValue(defaultValue, i);
}
diff --git a/Source/Editor/CustomEditors/Editors/CollectionEditor.cs b/Source/Editor/CustomEditors/Editors/CollectionEditor.cs
index f7c6c1e06..2ae2e6ea5 100644
--- a/Source/Editor/CustomEditors/Editors/CollectionEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/CollectionEditor.cs
@@ -77,11 +77,15 @@ namespace FlaxEditor.CustomEditors.Editors
}
}
+ ///
+ /// Determines if value of collection can be null.
+ ///
+ protected bool NotNullItems;
private IntegerValueElement _size;
+ private Color _background;
private int _elementsCount;
private bool _readOnly;
private bool _canReorderItems;
- private bool _notNullItems;
///
/// Gets the length of the collection.
@@ -105,7 +109,7 @@ namespace FlaxEditor.CustomEditors.Editors
{
_readOnly = false;
_canReorderItems = true;
- _notNullItems = false;
+ NotNullItems = false;
// No support for different collections for now
if (HasDifferentValues || HasDifferentTypes)
@@ -118,13 +122,19 @@ namespace FlaxEditor.CustomEditors.Editors
Type overrideEditorType = null;
float spacing = 10.0f;
var collection = (CollectionAttribute)attributes?.FirstOrDefault(x => x is CollectionAttribute);
- if (collection != null)
+ if (collection is null)
+ {
+ _readOnly = false;
+ NotNullItems = false;
+ _background = new Color(1f, 1f, 1f, 0.08f);
+ }
+ else
{
// TODO: handle NotNullItems by filtering child editors SetValue
-
_readOnly = collection.ReadOnly;
_canReorderItems = collection.CanReorderItems;
- _notNullItems = collection.NotNullItems;
+ NotNullItems = collection.NotNullItems;
+ _background = collection.BackgroundColor;
overrideEditorType = TypeUtils.GetType(collection.OverrideEditorTypeName).Type;
spacing = collection.Spacing;
}
@@ -146,6 +156,8 @@ namespace FlaxEditor.CustomEditors.Editors
// Elements
if (size > 0)
{
+ var panel = layout.VerticalPanel();
+ panel.Panel.BackgroundColor = _background;
var elementType = ElementType;
if (_canReorderItems)
{
@@ -153,7 +165,7 @@ namespace FlaxEditor.CustomEditors.Editors
{
if (i != 0 && spacing > 0f)
{
- if (layout.Children.Count > 0 && layout.Children[layout.Children.Count - 1] is PropertiesListElement propertiesListElement)
+ if (panel.Children.Count > 0 && panel.Children[panel.Children.Count - 1] is PropertiesListElement propertiesListElement)
{
if (propertiesListElement.Labels.Count > 0)
{
@@ -166,12 +178,12 @@ namespace FlaxEditor.CustomEditors.Editors
}
else
{
- layout.Space(spacing);
+ panel.Space(spacing);
}
}
var overrideEditor = overrideEditorType != null ? (CustomEditor)Activator.CreateInstance(overrideEditorType) : null;
- layout.Object(new CollectionItemLabel(this, i), new ListValueContainer(elementType, i, Values), overrideEditor);
+ panel.Object(new CollectionItemLabel(this, i), new ListValueContainer(elementType, i, Values), overrideEditor);
}
}
else
@@ -180,14 +192,14 @@ namespace FlaxEditor.CustomEditors.Editors
{
if (i != 0 && spacing > 0f)
{
- if (layout.Children.Count > 0 && layout.Children[layout.Children.Count - 1] is PropertiesListElement propertiesListElement)
+ if (panel.Children.Count > 0 && panel.Children[panel.Children.Count - 1] is PropertiesListElement propertiesListElement)
propertiesListElement.Space(spacing);
else
- layout.Space(spacing);
+ panel.Space(spacing);
}
var overrideEditor = overrideEditorType != null ? (CustomEditor)Activator.CreateInstance(overrideEditorType) : null;
- layout.Object("Element " + i, new ListValueContainer(elementType, i, Values), overrideEditor);
+ panel.Object("Element " + i, new ListValueContainer(elementType, i, Values), overrideEditor);
}
}
}
diff --git a/Source/Editor/CustomEditors/Editors/DictionaryEditor.cs b/Source/Editor/CustomEditors/Editors/DictionaryEditor.cs
index 1a57fa59d..62a8459f7 100644
--- a/Source/Editor/CustomEditors/Editors/DictionaryEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/DictionaryEditor.cs
@@ -135,6 +135,7 @@ namespace FlaxEditor.CustomEditors.Editors
}
private IntegerValueElement _size;
+ private Color _background;
private int _elementsCount;
private bool _readOnly;
private bool _notNullItems;
@@ -164,8 +165,6 @@ namespace FlaxEditor.CustomEditors.Editors
///
public override void Initialize(LayoutElementsContainer layout)
{
- _readOnly = false;
- _notNullItems = false;
// No support for different collections for now
if (HasDifferentValues || HasDifferentTypes)
@@ -185,12 +184,20 @@ namespace FlaxEditor.CustomEditors.Editors
if (attributes != null)
{
var collection = (CollectionAttribute)attributes.FirstOrDefault(x => x is CollectionAttribute);
- if (collection != null)
+ if (collection is null)
{
// TODO: handle ReadOnly and NotNullItems by filtering child editors SetValue
+
+ _readOnly = false;
+ _notNullItems = false;
+ _background = new Color(1f, 1f, 1f, 0.08f);
+ }
+ else
+ {
_readOnly = collection.ReadOnly;
_notNullItems = collection.NotNullItems;
+ _background = collection.BackgroundColor;
overrideEditorType = TypeUtils.GetType(collection.OverrideEditorTypeName).Type;
spacing = collection.Spacing;
}
@@ -213,13 +220,15 @@ namespace FlaxEditor.CustomEditors.Editors
// Elements
if (size > 0)
{
+ var panel = layout.VerticalPanel();
+ panel.Panel.BackgroundColor = _background;
var keysEnumerable = ((IDictionary)Values[0]).Keys.OfType
public float Spacing;
+
+ ///
+ /// Background color of the collection.
+ ///
+ public Color BackgroundColor = new Color(1f, 1f, 1f, 0.08f);
}
}