Skip to content

Commit 5babbe2

Browse files
authored
Merge pull request #60 from arimger/feature/extendable-editors
Feature/extendable editors
2 parents 3bdb984 + 5584f77 commit 5babbe2

31 files changed

Lines changed: 401 additions & 98 deletions

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginGroupAttributeDrawer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class BeginGroupAttributeDrawer : ToolboxDecoratorDrawer<BeginGroupAttrib
77
{
88
protected override void OnGuiBeginSafe(BeginGroupAttribute attribute)
99
{
10-
ToolboxLayoutHelper.BeginVertical(Style.groupBackgroundStyle);
10+
ToolboxLayoutHandler.BeginVertical(Style.groupBackgroundStyle);
1111
if (attribute.HasLabel)
1212
{
1313
GUILayout.Label(attribute.Label, EditorStyles.boldLabel);

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginHorizontalAttributeDrawer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ protected override void OnGuiBeginSafe(BeginHorizontalAttribute attribute)
1313
EditorGUIUtility.fieldWidth = width * attribute.FieldToWidthRatio;
1414

1515
//begin horizontal group using internal utility
16-
ToolboxLayoutHelper.BeginHorizontal();
16+
ToolboxLayoutHandler.BeginHorizontal();
1717
}
1818
}
1919
}

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginHorizontalGroupAttributeDrawer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ protected override void OnGuiBeginSafe(BeginHorizontalGroupAttribute attribute)
3737
EditorGUIUtility.labelWidth = fixedWidth * attribute.LabelToWidthRatio;
3838
EditorGUIUtility.fieldWidth = fixedWidth * attribute.FieldToWidthRatio;
3939

40-
ToolboxLayoutHelper.BeginVertical(Style.groupBackgroundStyle);
40+
ToolboxLayoutHandler.BeginVertical(Style.groupBackgroundStyle);
4141
if (attribute.HasLabel)
4242
{
4343
GUILayout.Label(attribute.Label, EditorStyles.boldLabel);
4444
}
4545

4646
HandleScrollView(fixedHeight);
47-
ToolboxLayoutHelper.BeginHorizontal();
47+
ToolboxLayoutHandler.BeginHorizontal();
4848
}
4949

5050

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/BeginVerticalAttributeDrawer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class BeginVerticalAttributeDrawer : ToolboxDecoratorDrawer<BeginVertical
66
{
77
protected override void OnGuiBeginSafe(BeginVerticalAttribute attribute)
88
{
9-
ToolboxLayoutHelper.BeginVertical();
9+
ToolboxLayoutHandler.BeginVertical();
1010
}
1111
}
1212
}

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndGroupAttributeDrawer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class EndGroupAttributeDrawer : ToolboxDecoratorDrawer<EndGroupAttribute>
66
{
77
protected override void OnGuiCloseSafe(EndGroupAttribute attribute)
88
{
9-
ToolboxLayoutHelper.CloseVertical();
9+
ToolboxLayoutHandler.CloseVertical();
1010
}
1111
}
1212
}

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndHorizontalAttributeDrawer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class EndHorizontalAttributeDrawer : ToolboxDecoratorDrawer<EndHorizontal
88
protected override void OnGuiCloseSafe(EndHorizontalAttribute attribute)
99
{
1010
//end horizontal group
11-
ToolboxLayoutHelper.CloseHorizontal();
11+
ToolboxLayoutHandler.CloseHorizontal();
1212

1313
//restore label & field
1414
EditorGUIUtility.labelWidth = 0.0f;

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndHorizontalGroupAttributeDrawer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ public class EndHorizontalGroupAttributeDrawer : ToolboxDecoratorDrawer<EndHoriz
77
{
88
protected override void OnGuiCloseSafe(EndHorizontalGroupAttribute attribute)
99
{
10-
ToolboxLayoutHelper.CloseHorizontal();
10+
ToolboxLayoutHandler.CloseHorizontal();
1111
EditorGUILayout.EndScrollView();
12-
ToolboxLayoutHelper.CloseVertical();
12+
ToolboxLayoutHandler.CloseVertical();
1313

1414
EditorGUIUtility.labelWidth = 0.0f;
1515
EditorGUIUtility.fieldWidth = 0.0f;

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/EndVerticalAttributeDrawer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class EndVerticalAttributeDrawer : ToolboxDecoratorDrawer<EndVerticalAttr
66
{
77
protected override void OnGuiCloseSafe(EndVerticalAttribute attribute)
88
{
9-
ToolboxLayoutHelper.CloseVertical();
9+
ToolboxLayoutHandler.CloseVertical();
1010
}
1111
}
1212
}

Assets/Editor Toolbox/Editor/Editors.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
using UnityEditor;
2+
using UnityEditor.AssetImporters;
3+
4+
namespace Toolbox.Editor.Editors
5+
{
6+
using Editor = UnityEditor.Editor;
7+
8+
public class ToolboxScriptedImporterEditor : ScriptedImporterEditor, IToolboxEditor
9+
{
10+
public sealed override void OnInspectorGUI()
11+
{
12+
ToolboxEditorHandler.HandleToolboxEditor(this);
13+
}
14+
15+
public virtual void DrawCustomInspector()
16+
{
17+
Drawer.DrawEditor(serializedObject);
18+
if (extraDataType != null)
19+
{
20+
Drawer.DrawEditor(extraDataSerializedObject);
21+
}
22+
23+
ApplyRevertGUI();
24+
}
25+
26+
public void IgnoreProperty(SerializedProperty property)
27+
{
28+
Drawer.IgnoreProperty(property);
29+
}
30+
31+
public void IgnoreProperty(string propertyPath)
32+
{
33+
Drawer.IgnoreProperty(propertyPath);
34+
}
35+
36+
37+
Editor IToolboxEditor.ContextEditor => this;
38+
public IToolboxEditorDrawer Drawer { get; } = new ToolboxEditorDrawer();
39+
}
40+
}

0 commit comments

Comments
 (0)