Alt+Shift+Drag clones nodes with incoming connections

This commit is contained in:
C T 2024-06-24 21:26:06 +03:00 committed by GitHub
parent 73ca780019
commit add7f72155
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -5924,7 +5924,24 @@ LGraphNode.prototype.executeAction = function(action)
// clone node ALT dragging // clone node ALT dragging
if (LiteGraph.alt_drag_do_clone_nodes && e.altKey && node && this.allow_interaction && !skip_action && !this.read_only) if (LiteGraph.alt_drag_do_clone_nodes && e.altKey && node && this.allow_interaction && !skip_action && !this.read_only)
{ {
if (cloned = node.clone()){ // nodes already selected
if (Object.keys(this.selected_nodes).length) {
var clipboard_info = this.prepareDataForClipboard()
var isConnectUnselected = e.shiftKey
this.graph.beforeChange();
//create nodes
this.pasteFromClipboardWithData(clipboard_info, isConnectUnselected, false);
skip_action = true;
// drag newly duplicated node under the cursor
node = this.graph.getNodeOnPos( e.canvasX, e.canvasY, this.visible_nodes, 5 );
this.node_dragged = node;
this.graph.afterChange();
}
else if (cloned = node.clone()){
cloned.pos[0] += 5; cloned.pos[0] += 5;
cloned.pos[1] += 5; cloned.pos[1] += 5;
this.graph.add(cloned,false,{doCalcSize: false}); this.graph.add(cloned,false,{doCalcSize: false});
@ -7136,7 +7153,7 @@ LGraphNode.prototype.executeAction = function(action)
} }
}; };
LGraphCanvas.prototype.copyToClipboard = function(nodes) { LGraphCanvas.prototype.prepareDataForClipboard = function(nodes) {
var clipboard_info = { var clipboard_info = {
nodes: [], nodes: [],
links: [] links: []
@ -7188,45 +7205,50 @@ LGraphNode.prototype.executeAction = function(action)
} }
} }
} }
return clipboard_info;
}
LGraphCanvas.prototype.copyToClipboard = function(nodes) {
var clipboard_info = this.prepareDataForClipboard(nodes);
localStorage.setItem( localStorage.setItem(
"litegrapheditor_clipboard", "litegrapheditor_clipboard",
JSON.stringify(clipboard_info) JSON.stringify(clipboard_info)
); );
}; };
LGraphCanvas.prototype.pasteFromClipboard = function(isConnectUnselected = false) { LGraphCanvas.prototype.pasteFromClipboardWithData = function(clipboard_info, isConnectUnselected = false, calculatePasteOffset = true) {
// if ctrl + shift + v is off, return when isConnectUnselected is true (shift is pressed) to maintain old behavior
if (!LiteGraph.ctrl_shift_v_paste_connect_unselected_outputs && isConnectUnselected) {
return;
}
var data = localStorage.getItem("litegrapheditor_clipboard");
if (!data) {
return;
}
this.graph.beforeChange();
//create nodes
var clipboard_info = JSON.parse(data);
// calculate top-left node, could work without this processing but using diff with last node pos :: clipboard_info.nodes[clipboard_info.nodes.length-1].pos // calculate top-left node, could work without this processing but using diff with last node pos :: clipboard_info.nodes[clipboard_info.nodes.length-1].pos
var posMin = false; var posMin = false;
var posMinIndexes = false; var posMinIndexes = false;
for (var i = 0; i < clipboard_info.nodes.length; ++i) {
if (posMin){
if(posMin[0]>clipboard_info.nodes[i].pos[0]){ var constantPasteOffset = 5;
posMin[0] = clipboard_info.nodes[i].pos[0]; var pasteOffsetX = constantPasteOffset;
posMinIndexes[0] = i; var pasteOffsetY = constantPasteOffset;
if (calculatePasteOffset)
{
for (var i = 0; i < clipboard_info.nodes.length; ++i) {
if (posMin){
if(posMin[0]>clipboard_info.nodes[i].pos[0]){
posMin[0] = clipboard_info.nodes[i].pos[0];
posMinIndexes[0] = i;
}
if(posMin[1]>clipboard_info.nodes[i].pos[1]){
posMin[1] = clipboard_info.nodes[i].pos[1];
posMinIndexes[1] = i;
}
} }
if(posMin[1]>clipboard_info.nodes[i].pos[1]){ else{
posMin[1] = clipboard_info.nodes[i].pos[1]; posMin = [clipboard_info.nodes[i].pos[0], clipboard_info.nodes[i].pos[1]];
posMinIndexes[1] = i; posMinIndexes = [i, i];
} }
} }
else{
posMin = [clipboard_info.nodes[i].pos[0], clipboard_info.nodes[i].pos[1]]; pasteOffsetX = this.graph_mouse[0] - posMin[0];
posMinIndexes = [i, i]; pasteOffsetY = this.graph_mouse[1] - posMin[1];
}
} }
var nodes = []; var nodes = [];
for (var i = 0; i < clipboard_info.nodes.length; ++i) { for (var i = 0; i < clipboard_info.nodes.length; ++i) {
var node_data = clipboard_info.nodes[i]; var node_data = clipboard_info.nodes[i];
@ -7235,8 +7257,8 @@ LGraphNode.prototype.executeAction = function(action)
node.configure(node_data); node.configure(node_data);
//paste in last known mouse position //paste in last known mouse position
node.pos[0] += this.graph_mouse[0] - posMin[0]; //+= 5; node.pos[0] += pasteOffsetX; //+= 5;
node.pos[1] += this.graph_mouse[1] - posMin[1]; //+= 5; node.pos[1] += pasteOffsetY; //+= 5;
this.graph.add(node,{doProcessChange:false}); this.graph.add(node,{doProcessChange:false});
@ -7265,6 +7287,23 @@ LGraphNode.prototype.executeAction = function(action)
} }
this.selectNodes(nodes); this.selectNodes(nodes);
}
LGraphCanvas.prototype.pasteFromClipboard = function(isConnectUnselected = false) {
// if ctrl + shift + v is off, return when isConnectUnselected is true (shift is pressed) to maintain old behavior
if (!LiteGraph.ctrl_shift_v_paste_connect_unselected_outputs && isConnectUnselected) {
return;
}
var data = localStorage.getItem("litegrapheditor_clipboard");
if (!data) {
return;
}
this.graph.beforeChange();
//create nodes
var clipboard_info = JSON.parse(data);
this.pasteFromClipboardWithData(clipboard_info, isConnectUnselected);
this.graph.afterChange(); this.graph.afterChange();
}; };