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

Rework drawer target

Browse Source
This commit is contained in:
VladV 2022-01-08 20:25:50 +03:00
parent bfaf46f661
commit 2e2bacb490
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Editor.Extras/Drawers/ShowDrawerChainDrawer.cs
View File

@ -4,8 +4,7 @@ using TriInspector;
using TriInspector.Drawers; using TriInspector.Drawers;
using TriInspector.Elements; using TriInspector.Elements;
[assembly: RegisterTriAttributeDrawer(typeof(ShowDrawerChainDrawer), TriDrawerOrder.System, [assembly: RegisterTriAttributeDrawer(typeof(ShowDrawerChainDrawer), TriDrawerOrder.System)]
Target = TriTargetPropertyType.SelfAndArrayElements)]
namespace TriInspector.Drawers namespace TriInspector.Drawers
{ {

2
Editor/Attributes.cs
View File

@ -13,7 +13,7 @@ namespace TriInspector
public Type DrawerType { get; } public Type DrawerType { get; }
public int Order { get; } public int Order { get; }
public TriTargetPropertyType Target { get; set; } = TriTargetPropertyType.SelfAndArrayElements; public TriTargetPropertyType Target { get; set; } = TriTargetPropertyType.Self;
} }
[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)] [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]

4
Editor/Elements/TriPropertyElement.cs
View File

@ -17,8 +17,8 @@ namespace TriInspector.Elements
var drawers = property.AllDrawers; var drawers = property.AllDrawers;
for (var index = drawers.Count - 1; index >= 0; index--) for (var index = drawers.Count - 1; index >= 0; index--)
{ {
if (_property.IsArrayElement && (drawers[index].Target & TriTargetPropertyType.ArrayElements) == 0 || if (_property.IsArray && (drawers[index].Target & TriTargetPropertyType.Array) == 0 ||
!_property.IsArrayElement && (drawers[index].Target & TriTargetPropertyType.Self) == 0) !_property.IsArray && (drawers[index].Target & TriTargetPropertyType.Self) == 0)
{ {
continue; continue;
} }

3
Editor/TriProperty.cs
View File

@ -129,6 +129,9 @@ namespace TriInspector
[PublicAPI] [PublicAPI]
public bool IsArrayElement => _definition.IsArrayElement; public bool IsArrayElement => _definition.IsArrayElement;
[PublicAPI]
public bool IsArray => _definition.IsArray;
public int IndexInArray => IsArrayElement public int IndexInArray => IsArrayElement
? _propertyIndex ? _propertyIndex
: throw new InvalidOperationException("Cannot read IndexInArray for !IsArrayElement"); : throw new InvalidOperationException("Cannot read IndexInArray for !IsArrayElement");

4
Editor/TriTargetPropertyType.cs
View File

@ -6,7 +6,7 @@ namespace TriInspector
public enum TriTargetPropertyType public enum TriTargetPropertyType
{ {
Self = 1 << 0, Self = 1 << 0,
ArrayElements = 1 << 2, Array = 1 << 2,
SelfAndArrayElements = Self | ArrayElements, SelfAndArray = Self | Array,
} }
} }