summaryrefslogtreecommitdiff
path: root/Assets/ActionTool/Editor
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/ActionTool/Editor')
-rw-r--r--Assets/ActionTool/Editor/ActionEditor.cs2
-rw-r--r--Assets/ActionTool/Editor/ActionEventEditor.cs7
-rw-r--r--Assets/ActionTool/Editor/ActionPreviewEditor.cs4
3 files changed, 10 insertions, 3 deletions
diff --git a/Assets/ActionTool/Editor/ActionEditor.cs b/Assets/ActionTool/Editor/ActionEditor.cs
index 10706fb4..d3377cc8 100644
--- a/Assets/ActionTool/Editor/ActionEditor.cs
+++ b/Assets/ActionTool/Editor/ActionEditor.cs
@@ -127,7 +127,7 @@ namespace ActionTool
TextClipping prevClipping = style.clipping;
bool prevRichText = style.richText;
style.alignment = TextAnchor.MiddleCenter;
- style.clipping = TextClipping.Overflow;
+ style.clipping = TextClipping.Clip;
style.richText = true;
m_AnimtionListScroll = EditorGUILayout.BeginScrollView(m_AnimtionListScroll);
diff --git a/Assets/ActionTool/Editor/ActionEventEditor.cs b/Assets/ActionTool/Editor/ActionEventEditor.cs
index 0fd9ea22..9a56f1ef 100644
--- a/Assets/ActionTool/Editor/ActionEventEditor.cs
+++ b/Assets/ActionTool/Editor/ActionEventEditor.cs
@@ -275,6 +275,13 @@ namespace ActionTool
field.SetValue(animEvent, GUI_Color((Color)field.GetValue(animEvent)));
}
}
+ else
+ {
+ Color c = GUI.color;
+ GUI.color = Color.red;
+ GUI_Label(new GUIContent("Unknown Type " + field.FieldType), GUI.skin.GetStyle("Label"));
+ GUI.color = c;
+ }
GUILayout.Space(5);
}
}
diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
index 7e9ffc08..20cfc16b 100644
--- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs
+++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs
@@ -841,7 +841,7 @@ namespace ActionTool
if (x > width)
{
m_ShowRightButton = true;
- if (GUI.Button(rightRect, "►", EditorStyles.miniButtonLeft))
+ if (GUI.Button(rightRect, ">", EditorStyles.miniButtonLeft))
{
m_ToolbarOffset -= Mathf.Min(kToolbarControlSize, x - width);
}
@@ -849,7 +849,7 @@ namespace ActionTool
if(m_ToolbarOffset < 0)
{
m_ShowLeftButton = true;
- if (GUI.Button(leftRect, "◄", EditorStyles.miniButtonRight))
+ if (GUI.Button(leftRect, "<", EditorStyles.miniButtonRight))
{
m_ToolbarOffset += Mathf.Min(kToolbarControlSize, -m_ToolbarOffset);
}