pencil2d · MrStevns · Sep 28, 2024 · Sep 28, 2024 · Oct 5, 2024 · Oct 19, 2024
diff --git a/app/src/timelinecells.cpp b/app/src/timelinecells.cpp
@@ -33,6 +33,7 @@ GNU General Public License for more details.
 #include "object.h"
 #include "playbackmanager.h"
 #include "preferencemanager.h"
+#include "undoredomanager.h"
 #include "timeline.h"
 
 #include "cameracontextmenu.h"
@@ -1065,8 +1066,15 @@ void TimeLineCells::mouseReleaseEvent(QMouseEvent* event)
             int posUnderCursor = getFrameNumber(mMousePressX);
             int offset = frameNumber - posUnderCursor;
 
-            currentLayer->moveSelectedFrames(offset);
+            if (currentLayer->canMoveSelectedFramesToOffset(offset)) {
+                SAVESTATE_ID saveStateId = mEditor->undoRedo()->createState(UndoRedoRecordType::KEYFRAME_MOVE);
+                UserSaveState userState;
+                userState.moveFramesState = MoveFramesSaveState(offset, currentLayer->selectedKeyFramesPositions());
+                mEditor->undoRedo()->addUserState(saveStateId, userState);
 
+                currentLayer->moveSelectedFrames(offset);
+                mEditor->undoRedo()->record(saveStateId, tr("Move Frames"));
+            }
             mEditor->layers()->notifyAnimationLengthChanged();
             emit mEditor->framesModified();
             updateContent();

diff --git a/core_lib/src/interface/editor.cpp b/core_lib/src/interface/editor.cpp
@@ -934,9 +934,15 @@ KeyFrame* Editor::addKeyFrame(const int layerNumber, int frameIndex)
     const bool ok = layer->addNewKeyFrameAt(frameIndex);
     Q_ASSERT(ok); // We already ensured that there is no keyframe at frameIndex, so this should always succeed
     scrubTo(frameIndex); // currentFrameChanged() emit inside.
+
+    SAVESTATE_ID saveStateId = undoRedo()->createState(UndoRedoRecordType::KEYFRAME_ADD);
     emit frameModified(frameIndex);
     layers()->notifyAnimationLengthChanged();
-    return layer->getKeyFrameAt(frameIndex);
+    KeyFrame* newFrame = layer->getKeyFrameAt(frameIndex);
+
+    undoRedo()->record(saveStateId, tr("Add frame"));
+
+    return newFrame;
 }
 
 void Editor::removeKey()
@@ -956,12 +962,15 @@ void Editor::removeKey()
         return;
     }
 
+    SAVESTATE_ID saveStateId =  undoRedo()->createState(UndoRedoRecordType::KEYFRAME_REMOVE);
     backup(tr("Remove frame"));
 
     deselectAll();
     layer->removeKeyFrame(currentFrame());
     layers()->notifyAnimationLengthChanged();
     emit layers()->currentLayerChanged(layers()->currentLayerIndex()); // trigger timeline repaint.
+
+    undoRedo()->record(saveStateId, tr("Remove frame"));
 }
 
 void Editor::scrubNextKeyFrame()

diff --git a/core_lib/src/interface/undoredocommand.cpp b/core_lib/src/interface/undoredocommand.cpp
@@ -24,6 +24,7 @@ GNU General Public License for more details.
 #include "layersound.h"
 #include "layerbitmap.h"
 #include "layervector.h"
+#include "layer.h"
 
 #include "editor.h"
 #include "undoredocommand.h"
@@ -38,6 +39,174 @@ UndoRedoCommand::~UndoRedoCommand()
 {
 }
 
+KeyFrameRemoveCommand::KeyFrameRemoveCommand(const KeyFrame* undoKeyFrame,
+                                         int undoLayerId,
+                                         const QString &description,
+                                         Editor *editor,
+                                         QUndoCommand *parent) : UndoRedoCommand(editor, parent)
+{
+    this->undoKeyFrame = undoKeyFrame->clone();
+    this->undoLayerId = undoLayerId;
+
+    this->redoLayerId = editor->layers()->currentLayer()->id();
+    this->redoPosition = editor->currentFrame();
+
+    setText(description);
+}
+
+KeyFrameRemoveCommand::~KeyFrameRemoveCommand()
+{
+    delete undoKeyFrame;
+}
+
+void KeyFrameRemoveCommand::undo()
+{
+    Layer* layer = editor()->layers()->findLayerById(undoLayerId);
+    if (layer == nullptr) {
+        // Until we support layer deletion recovery, we mark the command as
+        // obsolete as soon as it's been
+        return setObsolete(true);
+    }
+
+    UndoRedoCommand::undo();
+
+    layer->addKeyFrame(undoKeyFrame->pos(), undoKeyFrame->clone());
+
+    emit editor()->frameModified(undoKeyFrame->pos());
+    editor()->layers()->notifyAnimationLengthChanged();
+    editor()->scrubTo(undoKeyFrame->pos());
+}
+
+void KeyFrameRemoveCommand::redo()
+{
+    Layer* layer = editor()->layers()->findLayerById(redoLayerId);
+    if (layer == nullptr) {
+        // Until we support layer deletion recovery, we mark the command as
+        // obsolete as soon as it's been
+        return setObsolete(true);
+    }
+
+    UndoRedoCommand::redo();
+
+    if (isFirstRedo()) { setFirstRedo(false); return; }
+
+    layer->removeKeyFrame(redoPosition);
+
+    emit editor()->frameModified(redoPosition);
+    editor()->layers()->notifyAnimationLengthChanged();
+    editor()->scrubTo(redoPosition);
+}
+
+KeyFrameAddCommand::KeyFrameAddCommand(int undoPosition,
+                                       int undoLayerId,
+                                       const QString &description,
+                                       Editor *editor,
+                                       QUndoCommand *parent)
+    : UndoRedoCommand(editor, parent)
+{
+    this->undoPosition = undoPosition;
+    this->undoLayerId = undoLayerId;
+
+    this->redoLayerId = editor->layers()->currentLayer()->id();
+    this->redoPosition = editor->currentFrame();
+
+    setText(description);
+}
+
+KeyFrameAddCommand::~KeyFrameAddCommand()
+{
+}
+
+void KeyFrameAddCommand::undo()
+{
+    Layer* layer = editor()->layers()->findLayerById(undoLayerId);
+    if (!layer) {
+        return setObsolete(true);
+    }
+
+    UndoRedoCommand::undo();
+
+    layer->removeKeyFrame(undoPosition);
+
+    emit editor()->frameModified(undoPosition);
+    editor()->layers()->notifyAnimationLengthChanged();
+    editor()->layers()->setCurrentLayer(layer);
+    editor()->scrubTo(undoPosition);
+}
+
+void KeyFrameAddCommand::redo()
+{
+    Layer* layer = editor()->layers()->findLayerById(redoLayerId);
+    if (!layer) {
+        return setObsolete(true);
+    }
+
+    UndoRedoCommand::redo();
+
+    // Ignore automatic redo when added to undo stack
+    if (isFirstRedo()) { setFirstRedo(false); return; }
+
+    layer->addNewKeyFrameAt(redoPosition);
+
+    emit editor()->frameModified(redoPosition);
+    editor()->layers()->notifyAnimationLengthChanged();
+    editor()->layers()->setCurrentLayer(layer);
+    editor()->scrubTo(redoPosition);
+}
+
+MoveKeyFramesCommand::MoveKeyFramesCommand(int offset,
+                                         QList<int> listOfPositions,
+                                         int undoLayerId,
+                                         const QString& description,
+                                         Editor* editor,
+                                         QUndoCommand *parent)
+    : UndoRedoCommand(editor, parent)
+{
+    this->frameOffset = offset;
+    this->positions = listOfPositions;
+
+    this->undoLayerId = undoLayerId;
+    this->redoLayerId = editor->layers()->currentLayer()->id();
+
+    setText(description);
+}
+
+void MoveKeyFramesCommand::undo()
+{
+    Layer* undoLayer = editor()->layers()->findLayerById(undoLayerId);
+
+    if (!undoLayer) {
+        return setObsolete(true);
+    }
+
+    UndoRedoCommand::undo();
+
+    for (int position : qAsConst(positions)) {
+        undoLayer->moveKeyFrame(position + frameOffset, -frameOffset);
+    }
+
+    emit editor()->framesModified();
+}
+
+void MoveKeyFramesCommand::redo()
+{
+    Layer* redoLayer = editor()->layers()->findLayerById(redoLayerId);
+
+    if (!redoLayer) {
+        return setObsolete(true);
+    }
+
+    UndoRedoCommand::redo();
+
+    // Ignore automatic redo when added to undo stack
+    if (isFirstRedo()) { setFirstRedo(false); return; }
+
+    for (int position : qAsConst(positions)) {
+        redoLayer->moveKeyFrame(position, frameOffset);
+    }
+
+    emit editor()->framesModified();
+}
 BitmapReplaceCommand::BitmapReplaceCommand(const BitmapImage* undoBitmap,
                              const int undoLayerId,
                              const QString& description,
@@ -58,22 +227,30 @@ BitmapReplaceCommand::BitmapReplaceCommand(const BitmapImage* undoBitmap,
 
 void BitmapReplaceCommand::undo()
 {
-    QUndoCommand::undo();
-
     Layer* layer = editor()->layers()->findLayerById(undoLayerId);
+    if (!layer) {
+        return setObsolete(true);
+    }
+
+    UndoRedoCommand::undo();
+
     static_cast<LayerBitmap*>(layer)->replaceKeyFrame(&undoBitmap);
 
     editor()->scrubTo(undoBitmap.pos());
 }
 
 void BitmapReplaceCommand::redo()
 {
-    QUndoCommand::redo();
+    Layer* layer = editor()->layers()->findLayerById(redoLayerId);
+    if (!layer) {
+        return setObsolete(true);
+    }
+
+    UndoRedoCommand::redo();
 
     // Ignore automatic redo when added to undo stack
     if (isFirstRedo()) { setFirstRedo(false); return; }
 
-    Layer* layer = editor()->layers()->findLayerById(redoLayerId);
     static_cast<LayerBitmap*>(layer)->replaceKeyFrame(&redoBitmap);
 
     editor()->scrubTo(redoBitmap.pos());
@@ -98,9 +275,12 @@ VectorReplaceCommand::VectorReplaceCommand(const VectorImage* undoVector,
 
 void VectorReplaceCommand::undo()
 {
-    QUndoCommand::undo();
-
     Layer* layer = editor()->layers()->findLayerById(undoLayerId);
+    if (!layer) {
+        return setObsolete(true);
+    }
+
+    UndoRedoCommand::undo();
 
     static_cast<LayerVector*>(layer)->replaceKeyFrame(&undoVector);
 
@@ -109,13 +289,16 @@ void VectorReplaceCommand::undo()
 
 void VectorReplaceCommand::redo()
 {
-    QUndoCommand::redo();
+    Layer* layer = editor()->layers()->findLayerById(redoLayerId);
+    if (!layer) {
+        return setObsolete(true);
+    }
+
+    UndoRedoCommand::redo();
 
     // Ignore automatic redo when added to undo stack
     if (isFirstRedo()) { setFirstRedo(false); return; }
 
-    Layer* layer = editor()->layers()->findLayerById(redoLayerId);
-
     static_cast<LayerVector*>(layer)->replaceKeyFrame(&redoVector);
 
     editor()->scrubTo(redoVector.pos());
@@ -154,6 +337,7 @@ TransformCommand::TransformCommand(const QRectF& undoSelectionRect,
 
 void TransformCommand::undo()
 {
+    UndoRedoCommand::undo();
     apply(undoSelectionRect,
           undoTranslation,
           undoRotationAngle,
@@ -165,6 +349,8 @@ void TransformCommand::undo()
 
 void TransformCommand::redo()
 {
+    UndoRedoCommand::redo();
+
     // Ignore automatic redo when added to undo stack
     if (isFirstRedo()) { setFirstRedo(false); return; }