Cleanup 2

This commit is contained in:
W2.Wizard
2021-02-21 10:23:01 +01:00
parent 52bc268ee7
commit 92fafe877c
11 changed files with 234 additions and 143 deletions

View File

@@ -171,16 +171,22 @@ namespace FlaxEditor.Surface.ContextMenu
// Check if can create group for them
if (nodes.Count > 0)
{
var group = new VisjectCMGroup(this, groupArchetype);
group.HeaderText = groupArchetype.Name;
var group = new VisjectCMGroup(this, groupArchetype)
{
HeaderText = groupArchetype.Name
};
group.Close(false);
for (int i = 0; i < nodes.Count; i++)
{
var item = new VisjectCMItem(group, groupArchetype, nodes[i]);
item.Parent = group;
var item = new VisjectCMItem(group, groupArchetype, nodes[i])
{
Parent = group
};
}
group.SortChildren();
group.Parent = panel2;
_groups.Add(group);
}
}
@@ -209,16 +215,21 @@ namespace FlaxEditor.Surface.ContextMenu
// Create new group if name is unique
if (group == null)
{
group = new VisjectCMGroup(this, info.CustomNodesGroup);
group.HeaderText = groupName;
group = new VisjectCMGroup(this, info.CustomNodesGroup)
{
HeaderText = groupName
};
group.Close(false);
group.Parent = _groupsPanel;
_groups.Add(group);
}
// Add new item
var item = new VisjectCMItem(group, info.CustomNodesGroup, nodeArchetype);
item.Parent = group;
var item = new VisjectCMItem(group, info.CustomNodesGroup, nodeArchetype)
{
Parent = group
};
// Order items
group.SortChildren();
@@ -237,16 +248,23 @@ namespace FlaxEditor.Surface.ContextMenu
{
Profiler.BeginEvent("VisjectCM.AddGroup");
var group = new VisjectCMGroup(this, groupArchetype);
group.HeaderText = groupArchetype.Name;
var group = new VisjectCMGroup(this, groupArchetype)
{
HeaderText = groupArchetype.Name
};
group.Close(false);
foreach (var nodeArchetype in groupArchetype.Archetypes)
{
var item = new VisjectCMItem(group, groupArchetype, nodeArchetype);
item.Parent = group;
var item = new VisjectCMItem(group, groupArchetype, nodeArchetype)
{
Parent = group
};
}
group.SortChildren();
group.Parent = _groupsPanel;
_groups.Add(group);
if (!IsLayoutLocked)
@@ -281,17 +299,24 @@ namespace FlaxEditor.Surface.ContextMenu
var groups = new List<VisjectCMGroup>();
foreach (var groupArchetype in groupArchetypes)
{
var group = new VisjectCMGroup(this, groupArchetype);
group.HeaderText = groupArchetype.Name;
var group = new VisjectCMGroup(this, groupArchetype)
{
HeaderText = groupArchetype.Name
};
group.Close(false);
foreach (var nodeArchetype in groupArchetype.Archetypes)
{
var item = new VisjectCMItem(group, groupArchetype, nodeArchetype);
item.Parent = group;
var item = new VisjectCMItem(group, groupArchetype, nodeArchetype)
{
Parent = group
};
}
group.SortChildren();
group.Parent = _groupsPanel;
_groups.Add(group);
groups.Add(group);
}
Profiler.EndEvent();
@@ -497,8 +522,11 @@ namespace FlaxEditor.Surface.ContextMenu
Archetypes = archetypes
};
var group = new VisjectCMGroup(this, groupArchetype);
group.HeaderText = groupArchetype.Name;
var group = new VisjectCMGroup(this, groupArchetype)
{
HeaderText = groupArchetype.Name
};
group.Close(false);
archetypeIndex = 0;
for (int i = 0; i < parameters.Count; i++)
@@ -507,13 +535,17 @@ namespace FlaxEditor.Surface.ContextMenu
if (!param.IsPublic)
continue;
var item = new VisjectCMItem(group, groupArchetype, archetypes[archetypeIndex++]);
item.Parent = group;
var item = new VisjectCMItem(group, groupArchetype, archetypes[archetypeIndex++])
{
Parent = group
};
if (_parameterSetNodeArchetype != null)
{
item = new VisjectCMItem(group, groupArchetype, archetypes[archetypeIndex++]);
item.Parent = group;
item = new VisjectCMItem(group, groupArchetype, archetypes[archetypeIndex++])
{
Parent = group
};
}
}
group.SortChildren();