UnityMirror/xNode
1
0
Fork 0
mirror of https://github.com/Siccity/xNode.git synced 2025-12-20 17:26:02 +08:00
Code

Fix/error on duplicate (#82)

Browse Source 
* Pressing CTRL+D (duplicate) threw editorgui exception "Getting control 0s position in a group with only 3 controls when doing ValidateCommand".
comparing to https://github.com/Unity-Technologies/UnityCsReference/blob/master/Editor/Mono/SceneHierarchyWindow.cs : row 211, the proper use of the event was not made.

also fixed spelling of Dublicate to Duplicate.

* Braces on wrong lines.

* Something got wrong with the comments.
This commit is contained in:
Simon Rodriguez 2018-12-10 23:33:25 +01:00 committed by Thor Brigsted
parent e2549808cc
commit 6c1af6f4cd
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Scripts/Editor/NodeEditorAction.cs
View File

@ -278,9 +278,17 @@ namespace XNodeEditor {
} }
break; break;
case EventType.ValidateCommand: case EventType.ValidateCommand:
if (e.commandName == "SoftDelete") RemoveSelectedNodes(); case EventType.ExecuteCommand:
else if (SystemInfo.operatingSystemFamily == OperatingSystemFamily.MacOSX && e.commandName == "Delete") RemoveSelectedNodes(); if (e.commandName == "SoftDelete") {
else if (e.commandName == "Duplicate") DublicateSelectedNodes(); if (e.type == EventType.ExecuteCommand) RemoveSelectedNodes();
e.Use();
} else if (SystemInfo.operatingSystemFamily == OperatingSystemFamily.MacOSX && e.commandName == "Delete") {
if (e.type == EventType.ExecuteCommand) RemoveSelectedNodes();
e.Use();
} else if (e.commandName == "Duplicate") {
if (e.type == EventType.ExecuteCommand) DuplicateSelectedNodes();
e.Use();
}
Repaint(); Repaint();
break; break;
case EventType.Ignore: case EventType.Ignore:
@ -357,8 +365,8 @@ namespace XNodeEditor {
} }
} }
/// <summary> Dublicate selected nodes and select the dublicates </summary> /// <summary> Duplicate selected nodes and select the duplicates </summary>
public void DublicateSelectedNodes() { public void DuplicateSelectedNodes() {
UnityEngine.Object[] newNodes = new UnityEngine.Object[Selection.objects.Length]; UnityEngine.Object[] newNodes = new UnityEngine.Object[Selection.objects.Length];
Dictionary<XNode.Node, XNode.Node> substitutes = new Dictionary<XNode.Node, XNode.Node>(); Dictionary<XNode.Node, XNode.Node> substitutes = new Dictionary<XNode.Node, XNode.Node>();
for (int i = 0; i < Selection.objects.Length; i++) { for (int i = 0; i < Selection.objects.Length; i++) {

2
Scripts/Editor/NodeEditorGUI.cs
View File

@ -126,7 +126,7 @@ namespace XNodeEditor {
contextMenu.AddItem(new GUIContent("Rename"), false, RenameSelectedNode); contextMenu.AddItem(new GUIContent("Rename"), false, RenameSelectedNode);
} }
contextMenu.AddItem(new GUIContent("Duplicate"), false, DublicateSelectedNodes); contextMenu.AddItem(new GUIContent("Duplicate"), false, DuplicateSelectedNodes);
contextMenu.AddItem(new GUIContent("Remove"), false, RemoveSelectedNodes); contextMenu.AddItem(new GUIContent("Remove"), false, RemoveSelectedNodes);
// If only one node is selected // If only one node is selected