diff options
| author | Sofox <sofoxx@gmail.com> | 2023-11-06 23:55:14 +0000 |
|---|---|---|
| committer | Sofox <sofoxx@gmail.com> | 2023-11-10 13:04:12 +0000 |
| commit | 662522ae5ad1d4320447ffb4de43be6aea3d6e0e (patch) | |
| tree | a152eba5378e7c4a61e4754d7336b6d5df8a7959 /editor/editor_undo_redo_manager.cpp | |
| parent | 3e7f638d7b574785f521beafaf52a6ad95be016f (diff) | |
| download | redot-engine-662522ae5ad1d4320447ffb4de43be6aea3d6e0e.tar.gz | |
Fix for stopping the Undo History being desynchronised from actual Undo queue.
Diffstat (limited to 'editor/editor_undo_redo_manager.cpp')
| -rw-r--r-- | editor/editor_undo_redo_manager.cpp | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/editor/editor_undo_redo_manager.cpp b/editor/editor_undo_redo_manager.cpp index 5b064c9ae3..c2491f8611 100644 --- a/editor/editor_undo_redo_manager.cpp +++ b/editor/editor_undo_redo_manager.cpp @@ -239,6 +239,7 @@ void EditorUndoRedoManager::commit_action(bool p_execute) { is_committing = true; History &history = get_or_create_history(pending_action.history_id); + bool merging = history.undo_redo->is_merging(); history.undo_redo->commit_action(p_execute); history.redo_stack.clear(); @@ -248,39 +249,10 @@ void EditorUndoRedoManager::commit_action(bool p_execute) { return; } - if (!history.undo_stack.is_empty()) { - // Discard action if it should be merged (UndoRedo handles merging internally). - switch (pending_action.merge_mode) { - case UndoRedo::MERGE_DISABLE: - break; // Nothing to do here. - case UndoRedo::MERGE_ENDS: { - if (history.undo_stack.size() < 2) { - break; - } - - const Action &prev_action = history.undo_stack.back()->get(); - const Action &pre_prev_action = history.undo_stack.back()->prev()->get(); - if (pending_action.merge_mode == prev_action.merge_mode && pending_action.merge_mode == pre_prev_action.merge_mode && - pending_action.action_name == prev_action.action_name && pending_action.action_name == pre_prev_action.action_name) { - pending_action = Action(); - is_committing = false; - emit_signal(SNAME("history_changed")); - return; - } - } break; - case UndoRedo::MERGE_ALL: { - const Action &prev_action = history.undo_stack.back()->get(); - if (pending_action.merge_mode == prev_action.merge_mode && pending_action.action_name == prev_action.action_name) { - pending_action = Action(); - is_committing = false; - emit_signal(SNAME("history_changed")); - return; - } - } break; - } + if (!merging) { + history.undo_stack.push_back(pending_action); } - history.undo_stack.push_back(pending_action); pending_action = Action(); is_committing = false; emit_signal(SNAME("history_changed")); |