Merge branch 'master' into nodeview-redux

2021-05-23 10:49:11 +10:00
parent 3c17ecc94e 09dc79f9f6
commit 74a1507c6f
7 changed files with 154 additions and 57 deletions
@@ -24,6 +24,7 @@
 #include "node/project/footage/footage.h"
 #include "node/project/sequence/sequence.h"
 #include "ui/icons/icons.h"
+#include "widget/nodeview/nodeviewundo.h"

 namespace olive {

@@ -154,4 +155,21 @@ void FolderAddChild::undo()
  folder_->InputArrayRemoveLast(Folder::kChildInput);
 }

+void Folder::RemoveElementCommand::redo()
+{
+  if (!subcommand_) {
+    remove_index_ = folder_->index_of_child_in_array(child_);
+    if (remove_index_ != -1) {
+      NodeInput connected_input(folder_, Folder::kChildInput, remove_index_);
+      subcommand_ = new MultiUndoCommand();
+      subcommand_->add_child(new NodeEdgeRemoveCommand(folder_->GetConnectedOutput(connected_input), connected_input));
+      subcommand_->add_child(new Node::ArrayRemoveCommand(folder_, Folder::kChildInput, remove_index_));
+    }
+  }
+
+  if (subcommand_) {
+    subcommand_->redo();
+  }
+}
+
 }