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

Merge branch 'save-collection-groups' of https://github.com/Tryibion/FlaxEngine into Tryibion-save-collection-groups

Browse Source 
# Conflicts:
#	Source/Editor/CustomEditors/Editors/CollectionEditor.cs
This commit is contained in:
Wojtek Figat
2024-08-30 13:17:46 +02:00
parent b80409c195 6930139f9a
commit ce7b11adfc
3 changed files with 111 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,14 +2,18 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using FlaxEditor.CustomEditors.GUI;
using FlaxEditor.GUI.Input;
using FlaxEditor.Content;
using FlaxEditor.CustomEditors.Elements;
using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Drag;
using FlaxEditor.SceneGraph;
using FlaxEditor.Scripting;
using FlaxEditor.Windows;
using FlaxEditor.Windows.Assets;
using FlaxEngine;
using FlaxEngine.GUI;
using FlaxEngine.Utilities;
@@ -235,7 +239,38 @@ namespace FlaxEditor.CustomEditors.Editors
ArrowImageClosed = new SpriteBrush(icons.ArrowRight12);
ArrowImageOpened = new SpriteBrush(icons.ArrowDown12);
HeaderText = $"Element {index}";
IsClosed = false;
string saveName = string.Empty;
if (editor.Presenter?.Owner is PropertiesWindow propertiesWindow)
{
var selection = FlaxEditor.Editor.Instance.SceneEditing.Selection[0];
if (selection != null)
{
saveName += $"{selection.ID},";
}
}
else if (editor.Presenter?.Owner is PrefabWindow prefabWindow)
{
var selection = prefabWindow.Selection[0];
if (selection != null)
{
saveName += $"{selection.ID},";
}
}
if (editor.ParentEditor?.Layout.ContainerControl is DropPanel pdp)
{
saveName += $"{pdp.HeaderText},";
}
if (editor.Layout.ContainerControl is DropPanel mainGroup)
{
saveName += $"{mainGroup.HeaderText}";
IsClosed = FlaxEditor.Editor.Instance.ProjectCache.IsGroupToggled($"{saveName}:{index}");
}
else
{
IsClosed = false;
}
Editor = editor;
Index = index;
Offsets = new Margin(7, 7, 0, 0);
@@ -246,6 +281,37 @@ namespace FlaxEditor.CustomEditors.Editors
HeaderTextMargin = new Margin(18, 0, 0, 0);
_arrangeButtonRect = new Rectangle(16, 3, 12, 12);
}
IsClosedChanged += OnIsClosedChanged;
}
private void OnIsClosedChanged(DropPanel panel)
{
string saveName = string.Empty;
if (Editor.Presenter?.Owner is PropertiesWindow pw)
{
var selection = FlaxEditor.Editor.Instance.SceneEditing.Selection[0];
if (selection != null)
{
saveName += $"{selection.ID},";
}
}
else if (Editor.Presenter?.Owner is PrefabWindow prefabWindow)
{
var selection = prefabWindow.Selection[0];
if (selection != null)
{
saveName += $"{selection.ID},";
}
}
if (Editor.ParentEditor?.Layout.ContainerControl is DropPanel pdp)
{
saveName += $"{pdp.HeaderText},";
}
if (Editor.Layout.ContainerControl is DropPanel mainGroup)
{
saveName += $"{mainGroup.HeaderText}";
FlaxEditor.Editor.Instance.ProjectCache.SetGroupToggle($"{saveName}:{Index}", panel.IsClosed);
}
}
private bool ArrangeAreaCheck(out int index, out Rectangle rect)
@@ -384,6 +450,7 @@ namespace FlaxEditor.CustomEditors.Editors
private bool _canResize;
private bool _canReorderItems;
private CollectionAttribute.DisplayType _displayType;
private List<CollectionDropPanel> _cachedDropPanels = new List<CollectionDropPanel>();
/// <summary>
/// Gets the length of the collection.
@@ -526,7 +593,10 @@ namespace FlaxEditor.CustomEditors.Editors
(elementType.GetProperties().Length == 1 && elementType.GetFields().Length == 0) ||
elementType.Equals(new ScriptType(typeof(JsonAsset))) ||
elementType.Equals(new ScriptType(typeof(SettingsBase)));
bool prevWasNestedPropertiesList = false;
if (_cachedDropPanels == null)
_cachedDropPanels = new List<CollectionDropPanel>();
else
_cachedDropPanels.Clear();
for (int i = 0; i < size; i++)
{
// Apply spacing
@@ -546,19 +616,24 @@ namespace FlaxEditor.CustomEditors.Editors
itemLabel.LinkedEditor = itemLayout.Object(new ListValueContainer(elementType, i, Values, attributes), overrideEditor);
if (_readOnly && itemLayout.Children.Count > 0)
GenericEditor.OnReadOnlyProperty(itemLayout);
prevWasNestedPropertiesList = false;
}
else if (_displayType == CollectionAttribute.DisplayType.Header || (_displayType == CollectionAttribute.DisplayType.Default && !single))
{
var cdp = panel.CustomContainer<CollectionDropPanel>();
_cachedDropPanels.Add(cdp.CustomControl);
cdp.CustomControl.Setup(this, i, _canReorderItems);
var itemLayout = cdp.VerticalPanel();
cdp.CustomControl.LinkedEditor = itemLayout.Object(new ListValueContainer(elementType, i, Values, attributes), overrideEditor);
if (_readOnly && itemLayout.Children.Count > 0)
GenericEditor.OnReadOnlyProperty(itemLayout);
prevWasNestedPropertiesList = false;
}
}
if (_displayType == CollectionAttribute.DisplayType.Header || (_displayType == CollectionAttribute.DisplayType.Default && !single))
{
if (Layout is GroupElement g)
g.SetupContextMenu += OnSetupContextMenu;
}
}
_elementsCount = size;
@@ -593,6 +668,28 @@ namespace FlaxEditor.CustomEditors.Editors
}
}
private void OnSetupContextMenu(ContextMenu menu, DropPanel panel)
{
if (menu.Items.Any(x => x is ContextMenuButton b && b.Text.Equals("Open All", StringComparison.Ordinal)))
return;
menu.AddSeparator();
menu.AddButton("Open All", () =>
{
foreach (var cachedPanel in _cachedDropPanels)
{
cachedPanel.IsClosed = false;
}
});
menu.AddButton("Close All", () =>
{
foreach (var cachedPanel in _cachedDropPanels)
{
cachedPanel.IsClosed = true;
}
});
}
/// <inheritdoc />
protected override void Deinitialize()
{

7
Source/Editor/CustomEditors/Elements/Container/GroupElement.cs
View File

@@ -1,5 +1,7 @@
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
using System;
using FlaxEditor.GUI.ContextMenu;
using FlaxEngine;
using FlaxEngine.GUI;
@@ -24,6 +26,11 @@ namespace FlaxEditor.CustomEditors.Elements
EnableContainmentLines = true,
};
/// <summary>
/// Event is fired if the group can setup a context menu and the context menu is being setup.
/// </summary>
public Action<ContextMenu, DropPanel> SetupContextMenu;
/// <inheritdoc />
public override ContainerControl ContainerControl => Panel;

5
Source/Editor/CustomEditors/LayoutElementsContainer.cs
View File

@@ -74,11 +74,11 @@ namespace FlaxEditor.CustomEditors
{
var element = Group(title, useTransparentHeader);
element.Panel.Tag = linkedEditor;
element.Panel.MouseButtonRightClicked += OnGroupPanelMouseButtonRightClicked;
element.Panel.MouseButtonRightClicked += (panel, location) => OnGroupPanelMouseButtonRightClicked(element, panel, location);
return element;
}
private void OnGroupPanelMouseButtonRightClicked(DropPanel groupPanel, Float2 location)
private void OnGroupPanelMouseButtonRightClicked(GroupElement element, DropPanel groupPanel, Float2 location)
{
var linkedEditor = (CustomEditor)groupPanel.Tag;
var menu = new ContextMenu();
@@ -91,6 +91,7 @@ namespace FlaxEditor.CustomEditors
menu.AddButton("Copy", linkedEditor.Copy);
var paste = menu.AddButton("Paste", linkedEditor.Paste);
paste.Enabled = linkedEditor.CanPaste;
element.SetupContextMenu?.Invoke(menu, groupPanel);
menu.Show(groupPanel, location);
}