oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nodes: if an item is pasted without a folder, ensure it is added to a folder

Browse Source
This commit is contained in:
itsmattkc
2023-02-28 20:51:33 -08:00
parent 9824760ce1
commit 43e4e78378
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/nodeview/nodeview.cpp
+3
View File
@@ -1092,6 +1092,9 @@ QVector<Node*> NodeView::ProcessDroppingAttachedNodes(MultiUndoCommand *command,
// Add node to the same graph that the context is in // Add node to the same graph that the context is in
if (ai.node->parent() != select_context->parent()) { if (ai.node->parent() != select_context->parent()) {
add_command->add_child(new NodeAddCommand(select_context->parent(), ai.node)); add_command->add_child(new NodeAddCommand(select_context->parent(), ai.node));
if (ai.node->IsItem() && !ai.node->folder()) {
add_command->add_child(new FolderAddChild(select_context->parent()->root(), ai.node));
}
} }
// Add node to the context // Add node to the context
app/widget/timelinewidget/timelinewidget.cpp
+5 -1
View File
@@ -1945,8 +1945,12 @@ bool TimelineWidget::PasteInternal(bool insert)
MultiUndoCommand *command = new MultiUndoCommand(); MultiUndoCommand *command = new MultiUndoCommand();
Project *project = GetConnectedNode()->project();
foreach (Node *n, res.GetLoadData().nodes) { foreach (Node *n, res.GetLoadData().nodes) {
command->add_child(new NodeAddCommand(GetConnectedNode()->project(), n)); command->add_child(new NodeAddCommand(project, n));
if (n->IsItem() && !n->folder()) {
command->add_child(new FolderAddChild(project->root(), n));
}
} }
rational paste_start = GetConnectedNode()->GetPlayhead(); rational paste_start = GetConnectedNode()->GetPlayhead();