caleb-brown/Tri-Inspector
1
0
Fork 0
mirror of https://github.com/codewriter-packages/Tri-Inspector.git synced 2025-01-22 00:08:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Closes #8 - Add TableList attribute

Browse Source
This commit is contained in:
VladV 2022-05-30 13:15:09 +03:00
parent 48afdfa625
commit 5c5659100f
12 changed files with 367 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

368
Editor.Extras/Drawers/TableListDrawer.cs
View File

@ -1,12 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using TriInspector;
using TriInspector.Drawers;
using TriInspector.Elements;
using TriInspector.Utilities;
using TriInspectorUnityInternalBridge;
using UnityEditor;
using UnityEditor.IMGUI.Controls;
using UnityEditorInternal;
using UnityEngine;
[assembly: RegisterTriAttributeDrawer(typeof(TableListDrawer), TriDrawerOrder.Drawer)]
@ -30,23 +31,149 @@ namespace TriInspector.Drawers
return new TableElement(property);
}
private class TableElement : TriElement
private class TableElement : TriListElement
{
private readonly TableMultiColumnTreeView _treeView;
private const float FooterExtraSpace = 4;
public TableElement(TriProperty property)
private readonly TriProperty _property;
private readonly TableMultiColumnTreeView _treeView;
private readonly bool _alwaysExpanded;
private bool _reloadRequired;
private bool _heightDirty;
private bool _isExpanded;
private int _arraySize;
public TableElement(TriProperty property) : base(property)
{
_treeView = new TableMultiColumnTreeView(property, this);
_property = property;
_treeView = new TableMultiColumnTreeView(property, this, ListGui)
{
SelectionChangedCallback = SelectionChangedCallback,
};
_reloadRequired = true;
}
public override bool Update()
{
var dirty = base.Update();
dirty |= ReloadIfRequired();
if (dirty)
{
_heightDirty = true;
_treeView.multiColumnHeader.ResizeToFit();
}
return dirty;
}
public override float GetHeight(float width)
{
return _treeView.totalHeight;
_treeView.Width = width;
if (_heightDirty)
{
_heightDirty = false;
_treeView.RefreshHeight();
}
var height = 0f;
height += ListGui.headerHeight;
if (_property.IsExpanded)
{
height += _treeView.totalHeight;
height += ListGui.footerHeight;
height += FooterExtraSpace;
}
return height;
}
public override void OnGUI(Rect position)
{
_treeView.OnGUI(position);
position = EditorGUI.IndentedRect(position);
var headerRect = new Rect(position)
{
height = ListGui.headerHeight,
};
var elementsRect = new Rect(position)
{
yMin = headerRect.yMax,
height = _treeView.totalHeight + FooterExtraSpace,
};
var elementsContentRect = new Rect(elementsRect)
{
xMin = elementsRect.xMin + 1,
xMax = elementsRect.xMax - 1,
yMax = elementsRect.yMax - FooterExtraSpace,
};
var footerRect = new Rect(position)
{
yMin = elementsRect.yMax,
};
if (Event.current.isMouse && Event.current.type == EventType.MouseDrag)
{
_treeView.multiColumnHeader.ResizeToFit();
}
if (Event.current.type == EventType.Repaint)
{
ReorderableList.defaultBehaviours.boxBackground.Draw(elementsRect,
false, false, false, false);
}
ReorderableListProxy.DoListHeader(ListGui, headerRect);
EditorGUI.BeginChangeCheck();
if (_property.IsExpanded)
{
_treeView.OnGUI(elementsContentRect);
}
if (EditorGUI.EndChangeCheck())
{
_heightDirty = true;
_property.PropertyTree.RequestRepaint();
}
if (_property.IsExpanded)
{
ReorderableList.defaultBehaviours.DrawFooter(footerRect, ListGui);
}
}
private bool ReloadIfRequired()
{
if (!_reloadRequired &&
_property.IsExpanded == _isExpanded &&
_property.ArrayElementProperties.Count == _arraySize)
{
return false;
}
_reloadRequired = false;
_isExpanded = _property.IsExpanded;
_arraySize = _property.ArrayElementProperties.Count;
_treeView.Reload();
return true;
}
protected override TriElement CreateItemElement(TriProperty property)
{
return new TableRowElement(property);
}
private void SelectionChangedCallback(int index)
{
ListGui.index = index;
}
}
@ -55,131 +182,212 @@ namespace TriInspector.Drawers
{
private readonly TriProperty _property;
private readonly TriElement _cellElementContainer;
private readonly Dictionary<string, int> _cellIndexByName;
private readonly Dictionary<TriProperty, TriElement> _cellElements;
private readonly ReorderableList _listGui;
private readonly TableListPropertyOverrideContext _propertyOverrideContext;
public TableMultiColumnTreeView(TriProperty property, TriElement container)
: base(new TreeViewState(), BuildHeader(property))
public Action<int> SelectionChangedCallback;
public TableMultiColumnTreeView(TriProperty property, TriElement container, ReorderableList listGui)
: base(new TreeViewState(), new TableColumnHeader())
{
_property = property;
_cellElementContainer = container;
_listGui = listGui;
_propertyOverrideContext = new TableListPropertyOverrideContext(property);
_cellIndexByName = new Dictionary<string, int>();
_cellElements = new Dictionary<TriProperty, TriElement>();
_propertyOverrideContext = new TableListPropertyOverrideContext();
rowHeight = 20;
showAlternatingRowBackgrounds = true;
showBorder = true;
showBorder = false;
useScrollView = false;
Reload();
multiColumnHeader.ResizeToFit();
multiColumnHeader.visibleColumnsChanged += header => header.ResizeToFit();
}
public float Width { get; set; }
public void RefreshHeight()
{
RefreshCustomRowHeights();
}
protected override void SelectionChanged(IList<int> selectedIds)
{
base.SelectionChanged(selectedIds);
if (SelectionChangedCallback != null && selectedIds.Count == 1)
{
SelectionChangedCallback.Invoke(selectedIds[0]);
}
}
protected override TreeViewItem BuildRoot()
{
var root = new TreeViewItem(0, -1, string.Empty);
var columns = new List<MultiColumnHeaderState.Column>
{
new MultiColumnHeaderState.Column
{
width = 16, autoResize = false, canSort = false, allowToggleVisibility = false,
},
};
if (_property.IsExpanded)
{
for (var index = 0; index < _property.ArrayElementProperties.Count; index++)
{
var rowChildProperty = _property.ArrayElementProperties[index];
root.AddChild(new TableTreeElement(index, rowChildProperty));
root.AddChild(new TableTreeItem(index, rowChildProperty));
foreach (var cellValueProperty in rowChildProperty.ChildrenProperties)
if (index == 0)
{
if (!_cellIndexByName.ContainsKey(cellValueProperty.RawName))
foreach (var kvp in ((TableRowElement) (_cellElementContainer.GetChild(0))).Elements)
{
_cellIndexByName.Add(cellValueProperty.RawName, _cellIndexByName.Count);
columns.Add(new MultiColumnHeaderState.Column
{
headerContent = kvp.Value,
headerTextAlignment = TextAlignment.Center,
autoResize = true,
canSort = false,
});
}
}
}
}
if (root.children == null)
{
root.AddChild(new TreeViewItem(0, 0, "Empty"));
root.AddChild(new TableTreeEmptyItem());
}
if (multiColumnHeader.state == null ||
multiColumnHeader.state.columns.Length == 1)
{
multiColumnHeader.state = new MultiColumnHeaderState(columns.ToArray());
}
return root;
}
protected override float GetCustomRowHeight(int row, TreeViewItem item)
{
if (item is TableTreeEmptyItem)
{
return EditorGUIUtility.singleLineHeight;
}
var height = 0f;
var rowElement = (TableRowElement) _cellElementContainer.GetChild(row);
foreach (var visibleColumnIndex in multiColumnHeader.state.visibleColumns)
{
var cellHeight = visibleColumnIndex == 0
? EditorGUIUtility.singleLineHeight
: rowElement.Elements[visibleColumnIndex - 1].Key.GetHeight(Width);
height = Math.Max(height, cellHeight);
}
return height + EditorGUIUtility.standardVerticalSpacing * 2;
}
protected override void RowGUI(RowGUIArgs args)
{
var tableItem = args.item as TableTreeElement;
if (tableItem == null)
if (args.item is TableTreeEmptyItem)
{
base.RowGUI(args);
return;
}
foreach (var cellValueProperty in tableItem.Property.ChildrenProperties)
var rowElement = (TableRowElement) _cellElementContainer.GetChild(args.row);
for (var i = 0; i < multiColumnHeader.state.visibleColumns.Length; i++)
{
if (!_cellIndexByName.TryGetValue(cellValueProperty.RawName, out var cellIndex))
var visibleColumnIndex = multiColumnHeader.state.visibleColumns[i];
var rowIndex = args.row;
var cellRect = args.GetCellRect(i);
cellRect.yMin += EditorGUIUtility.standardVerticalSpacing;
if (visibleColumnIndex == 0)
{
ReorderableList.defaultBehaviours.DrawElementDraggingHandle(cellRect, rowIndex,
_listGui.index == rowIndex, _listGui.index == rowIndex, _listGui.draggable);
continue;
}
var cellRect = args.GetCellRect(cellIndex);
if (!_cellElements.ContainsKey(cellValueProperty))
{
var cellElement = new TriPropertyElement(cellValueProperty, new TriPropertyElement.Props
{
forceInline = true,
});
_cellElements.Add(cellValueProperty, cellElement);
_cellElementContainer.AddChild(cellElement);
}
var cellElement = rowElement.Elements[visibleColumnIndex - 1].Key;
cellRect.height = cellElement.GetHeight(Width);
using (TriGuiHelper.PushIndentLevel(-EditorGUI.indentLevel))
using (TriGuiHelper.PushLabelWidth(EditorGUIUtility.labelWidth / rowElement.ChildrenCount))
using (TriPropertyOverrideContext.BeginOverride(_propertyOverrideContext))
{
_cellElements[cellValueProperty].OnGUI(cellRect);
cellElement.OnGUI(cellRect);
}
}
}
}
private static MultiColumnHeader BuildHeader(TriProperty property)
public class TableRowElement : TriPropertyCollectionBaseElement
{
var columns = TriTypeDefinition
.GetCached(property.ArrayElementType)
.Properties
.Select(it => new MultiColumnHeaderState.Column
public TableRowElement(TriProperty property)
{
headerContent = new GUIContent(ObjectNames.NicifyVariableName(it.Name)),
autoResize = true,
canSort = false,
allowToggleVisibility = false,
})
.Concat(new[]
{
new MultiColumnHeaderState.Column
{
headerContent = GUIContent.none,
autoResize = false,
canSort = false,
allowToggleVisibility = false,
width = 10,
},
})
.ToArray();
DeclareGroups(property.ValueType);
var header = new MultiColumnHeader(new MultiColumnHeaderState(columns))
Elements = new List<KeyValuePair<TriElement, GUIContent>>();
if (property.PropertyType == TriPropertyType.Generic)
{
canSort = false,
foreach (var childProperty in property.ChildrenProperties)
{
var oldChildrenCount = ChildrenCount;
var props = new TriPropertyElement.Props
{
forceInline = true,
};
AddProperty(childProperty, props, out var group);
header.ResizeToFit();
if (oldChildrenCount != ChildrenCount)
{
var element = GetChild(ChildrenCount - 1);
var headerContent = new GUIContent(group ?? childProperty.DisplayName);
return header;
Elements.Add(new KeyValuePair<TriElement, GUIContent>(element, headerContent));
}
}
}
else
{
AddChild(new TriLabelElement("[TableList] cannot be used on non generic elements"));
}
}
public List<KeyValuePair<TriElement, GUIContent>> Elements { get; }
}
[Serializable]
private class TableColumnHeader : MultiColumnHeader
{
public TableColumnHeader() : base(null)
{
canSort = false;
height = DefaultGUI.minimumHeight;
}
}
[Serializable]
private class TableTreeElement : TreeViewItem
private class TableTreeEmptyItem : TreeViewItem
{
public TableTreeElement(int id, TriProperty property) : base(id, 0)
public TableTreeEmptyItem() : base(0, 0, "Table is Empty")
{
}
}
[Serializable]
private class TableTreeItem : TreeViewItem
{
public TableTreeItem(int id, TriProperty property) : base(id, 0)
{
Property = property;
}
@ -189,9 +397,27 @@ namespace TriInspector.Drawers
private class TableListPropertyOverrideContext : TriPropertyOverrideContext
{
public override GUIContent GetDisplayName(TriProperty property)
private readonly TriProperty _grandParentProperty;
private readonly GUIContent _noneLabel = GUIContent.none;
public TableListPropertyOverrideContext(TriProperty grandParentProperty)
{
return GUIContent.none;
_grandParentProperty = grandParentProperty;
}
public override bool TryGetDisplayName(TriProperty property, out GUIContent displayName)
{
if (property.PropertyType == TriPropertyType.Primitive &&
property.Parent is TriProperty parentProperty &&
parentProperty.Parent == _grandParentProperty &&
!property.TryGetAttribute(out GroupAttribute _))
{
displayName = _noneLabel;
return true;
}
displayName = default;
return false;
}
}
}

3
Editor.Extras/TriInspector.Editor.Extras.asmdef
View File

@ -3,7 +3,8 @@
"rootNamespace": "",
"references": [
"TriInspector",
"TriInspector.Editor"
"TriInspector.Editor",
"Unity.InternalAPIEditorBridge.012"
],
"includePlatforms": [
"Editor"

17
Editor/Elements/TriListElement.cs
View File

@ -8,7 +8,7 @@ using UnityEngine;
namespace TriInspector.Elements
{
internal class TriListElement : TriElement
public class TriListElement : TriElement
{
private const float ListExtraWidth = 7f;
private const float DraggableAreaExtraWidth = 14f;
@ -19,6 +19,8 @@ namespace TriInspector.Elements
private float _lastContentWidth;
protected ReorderableList ListGui => _reorderableListGui;
public TriListElement(TriProperty property)
{
property.TryGetAttribute(out ListDrawerSettings settings);
@ -242,10 +244,7 @@ namespace TriInspector.Elements
while (ChildrenCount < count)
{
var property = _property.ArrayElementProperties[ChildrenCount];
AddChild(new TriPropertyElement(property, new TriPropertyElement.Props
{
forceInline = true,
}));
AddChild(CreateItemElement(property));
}
while (ChildrenCount > count)
@ -268,6 +267,14 @@ namespace TriInspector.Elements
return true;
}
protected virtual TriElement CreateItemElement(TriProperty property)
{
return new TriPropertyElement(property, new TriPropertyElement.Props
{
forceInline = true,
});
}
private void DrawHeaderCallback(Rect rect)
{
using (TriGuiHelper.PushIndentLevel(-EditorGUI.indentLevel))

11
Editor/Elements/TriPropertyCollectionBaseElement.cs
View File

@ -32,7 +32,13 @@ namespace TriInspector.Elements
[PublicAPI]
public void AddProperty(TriProperty property)
{
var propertyElement = new TriPropertyElement(property);
AddProperty(property, default, out _);
}
[PublicAPI]
public void AddProperty(TriProperty property, TriPropertyElement.Props props, out string group)
{
var propertyElement = new TriPropertyElement(property, props);
if (property.TryGetAttribute(out GroupAttribute groupAttribute))
{
@ -41,15 +47,18 @@ namespace TriInspector.Elements
var remaining = path.GetEnumerator();
if (remaining.MoveNext())
{
group = remaining.Current;
AddGroupedChild(propertyElement, property, remaining.Current, remaining.Current, remaining);
}
else
{
group = null;
AddPropertyChild(propertyElement, property);
}
}
else
{
group = null;
AddPropertyChild(propertyElement, property);
}
}

2
Editor/TriElement.cs
View File

@ -151,6 +151,7 @@ namespace TriInspector
if (_attached)
{
child.AttachInternal();
child.Update();
}
}
@ -168,6 +169,7 @@ namespace TriInspector
foreach (var child in _children)
{
child.AttachInternal();
child.Update();
}
}

5
Editor/TriProperty.cs
View File

@ -66,9 +66,10 @@ namespace TriInspector
{
get
{
if (TriPropertyOverrideContext.Current != null)
if (TriPropertyOverrideContext.Current != null &&
TriPropertyOverrideContext.Current.TryGetDisplayName(this, out var overrideName))
{
return TriPropertyOverrideContext.Current.GetDisplayName(this);
return overrideName;
}
if (_displayNameBackingField == null)

2
Editor/TriPropertyOverrideContext.cs
View File

@ -8,7 +8,7 @@ namespace TriInspector
private static TriPropertyOverrideContext Override { get; set; }
public static TriPropertyOverrideContext Current { get; private set; }
public abstract GUIContent GetDisplayName(TriProperty property);
public abstract bool TryGetDisplayName(TriProperty property, out GUIContent displayName);
public static EnterPropertyScope BeginProperty()
{

28
README.md
View File

@ -326,6 +326,34 @@ public class MinMax
public List<Material> list;
```
#### TableList
![TableList](https://user-images.githubusercontent.com/26966368/171021981-e0aa5d4b-96b2-40dd-96b3-3cd6b3af01e3.png)
```csharp
[TableList(Draggable = true,
HideAddButton = false,
HideRemoveButton = false,
AlwaysExpanded = false)]
public List<TableItem> table;
[Serializable]
public class TableItem
{
public Texture icon;
public string description;
[Group("Combined"), LabelWidth(16)]
public string A, B, C;
[Button, Group("Actions")]
public void Test1() { }
[Button, Group("Actions")]
public void Test2() { }
}
```
### Conditionals
#### ShowIf

2
Runtime/Attributes/ListDrawerSettings.cs
View File

@ -5,7 +5,7 @@ namespace TriInspector
{
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
[Conditional("UNITY_EDITOR")]
public sealed class ListDrawerSettings : Attribute
public class ListDrawerSettings : Attribute
{
public bool Draggable { get; set; } = true;
public bool HideAddButton { get; set; }

2
Runtime/Attributes/TableListAttribute.cs
View File

@ -5,7 +5,7 @@ namespace TriInspector
{
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
[Conditional("UNITY_EDITOR")]
public sealed class TableListAttribute : Attribute
public sealed class TableListAttribute : ListDrawerSettings
{
}
}

1
Unity.InternalAPIEditorBridge.012/AssemblyInfo.cs
View File

@ -1,3 +1,4 @@
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("TriInspector.Editor")]
[assembly: InternalsVisibleTo("TriInspector.Editor.Extras")]

2
package.json
View File

@ -2,7 +2,7 @@
"name": "com.codewriter.triinspector",
"displayName": "Tri Inspector",
"description": "Advanced inspector attributes for Unity",
"version": "1.0.4",
"version": "1.0.5",
"unity": "2020.3",
"author": "CodeWriter (https://github.com/orgs/codewriter-packages)",
"homepage": "https://github.com/codewriter-packages/Tri-Inspector#readme",