godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #67963 from KoBeWi/den_of_actions

Browse Source 
Fix nested actions in EditorUndoRedoManager
This commit is contained in:
Rémi Verschelde
2022-11-14 18:29:46 +01:00
parent 4d9adfea23 d7ebf725c9
commit beed90ea6d
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/object/undo_redo.cpp
View File

@@ -423,6 +423,10 @@ String UndoRedo::get_current_action_name() const {
return actions[current_action].name; return actions[current_action].name;
} }
int UndoRedo::get_action_level() const {
return action_level;
}
bool UndoRedo::has_undo() const { bool UndoRedo::has_undo() const {
return current_action >= 0; return current_action >= 0;
} }

1
core/object/undo_redo.h
View File

@@ -120,6 +120,7 @@ public:
bool redo(); bool redo();
bool undo(); bool undo();
String get_current_action_name() const; String get_current_action_name() const;
int get_action_level() const;
int get_history_count(); int get_history_count();
int get_current_action(); int get_current_action();

2
editor/animation_track_editor.cpp
View File

@@ -3613,7 +3613,7 @@ void AnimationTrackEditor::_animation_track_remove_request(int p_track, Ref<Anim
} }
int idx = p_track; int idx = p_track;
if (idx >= 0 && idx < p_from_animation->get_track_count()) { if (idx >= 0 && idx < p_from_animation->get_track_count()) {
undo_redo->create_action(TTR("Remove Anim Track")); undo_redo->create_action(TTR("Remove Anim Track"), UndoRedo::MERGE_DISABLE, p_from_animation.ptr());
// Remove corresponding reset tracks if they are no longer needed. // Remove corresponding reset tracks if they are no longer needed.
AnimationPlayer *player = AnimationPlayerEditor::get_singleton()->get_player(); AnimationPlayer *player = AnimationPlayerEditor::get_singleton()->get_player();

11
editor/editor_undo_redo_manager.cpp
View File

@@ -110,9 +110,14 @@ EditorUndoRedoManager::History &EditorUndoRedoManager::get_history_for_object(Ob
} }
void EditorUndoRedoManager::create_action_for_history(const String &p_name, int p_history_id, UndoRedo::MergeMode p_mode) { void EditorUndoRedoManager::create_action_for_history(const String &p_name, int p_history_id, UndoRedo::MergeMode p_mode) {
if (pending_action.history_id != INVALID_HISTORY) {
// Nested action.
p_history_id = pending_action.history_id;
} else {
pending_action.action_name = p_name; pending_action.action_name = p_name;
pending_action.timestamp = OS::get_singleton()->get_unix_time(); pending_action.timestamp = OS::get_singleton()->get_unix_time();
pending_action.merge_mode = p_mode; pending_action.merge_mode = p_mode;
}
if (p_history_id != INVALID_HISTORY) { if (p_history_id != INVALID_HISTORY) {
pending_action.history_id = p_history_id; pending_action.history_id = p_history_id;
@@ -229,6 +234,12 @@ void EditorUndoRedoManager::commit_action(bool p_execute) {
history.undo_redo->commit_action(p_execute); history.undo_redo->commit_action(p_execute);
history.redo_stack.clear(); history.redo_stack.clear();
if (history.undo_redo->get_action_level() > 0) {
// Nested action.
is_committing = false;
return;
}
if (!history.undo_stack.is_empty()) { if (!history.undo_stack.is_empty()) {
const Action &prev_action = history.undo_stack.back()->get(); const Action &prev_action = history.undo_stack.back()->get();
if (pending_action.merge_mode != UndoRedo::MERGE_DISABLE && pending_action.merge_mode == prev_action.merge_mode && pending_action.action_name == prev_action.action_name) { if (pending_action.merge_mode != UndoRedo::MERGE_DISABLE && pending_action.merge_mode == prev_action.merge_mode && pending_action.action_name == prev_action.action_name) {