Browse Source

Fixed Add Command menu popup position

master
chrisgregan 11 years ago
parent
commit
4d5d836cea
  1. 10
      Assets/Fungus/FungusScript/Editor/SequenceEditor.cs
  2. BIN
      Assets/Shuttle/ShuttleGame.unity

10
Assets/Fungus/FungusScript/Editor/SequenceEditor.cs

@ -72,16 +72,14 @@ namespace Fungus.Script
CommandCategoryAttribute categoryAttr = obj as CommandCategoryAttribute; CommandCategoryAttribute categoryAttr = obj as CommandCategoryAttribute;
if (categoryAttr != null) if (categoryAttr != null)
{ {
string commandItem = categoryAttr.Category + " / " + FungusScriptEditor.GetCommandName(type); string commandItem = categoryAttr.Category + " - " + FungusScriptEditor.GetCommandName(type);
commandNames.Add(commandItem); commandNames.Add(commandItem);
break; break;
} }
} }
} }
Rect newRect = GUILayoutUtility.GetRect(100, 30); int selectedCommandIndex = EditorGUILayout.Popup(fungusScript.selectedAddCommandIndex, commandNames.ToArray());
int selectedCommandIndex = EditorGUI.Popup(newRect, fungusScript.selectedAddCommandIndex, commandNames.ToArray());
if (EditorGUI.EndChangeCheck()) if (EditorGUI.EndChangeCheck())
{ {
@ -110,7 +108,6 @@ namespace Fungus.Script
fungusScript.selectedSequence.commandList.Add(newCommand); fungusScript.selectedSequence.commandList.Add(newCommand);
} }
/*
if (fungusScript.copyCommand != null) if (fungusScript.copyCommand != null)
{ {
if (GUILayout.Button("Paste", EditorStyles.miniButton)) if (GUILayout.Button("Paste", EditorStyles.miniButton))
@ -118,7 +115,6 @@ namespace Fungus.Script
FungusCommandEditor.PasteCommand(fungusScript.copyCommand, fungusScript.selectedSequence); FungusCommandEditor.PasteCommand(fungusScript.copyCommand, fungusScript.selectedSequence);
} }
} }
*/
EditorGUILayout.EndHorizontal(); EditorGUILayout.EndHorizontal();
@ -135,8 +131,6 @@ namespace Fungus.Script
} }
} }
EditorGUILayout.Separator();
serializedObject.ApplyModifiedProperties(); serializedObject.ApplyModifiedProperties();
} }

BIN
Assets/Shuttle/ShuttleGame.unity

Binary file not shown.
Loading…
Cancel
Save