Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-03 15:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add argument to UndoRedo's "clear_history()" to not increase the version

Browse source
This commit is contained in:
Michael Alexsander Silva Dias 2018-11-18 18:07:38 -02:00
parent f769e13c5e
commit 6ba94d5ca0
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/undo_redo.cpp
View file

@ -325,7 +325,7 @@ bool UndoRedo::undo() {
return true; return true;
} }
void UndoRedo::clear_history() { void UndoRedo::clear_history(bool p_increase_version) {
ERR_FAIL_COND(action_level > 0); ERR_FAIL_COND(action_level > 0);
_discard_redo(); _discard_redo();
@ -333,6 +333,7 @@ void UndoRedo::clear_history() {
while (actions.size()) while (actions.size())
_pop_history_tail(); _pop_history_tail();
if (p_increase_version)
version++; version++;
} }
@ -493,7 +494,7 @@ void UndoRedo::_bind_methods() {
ClassDB::bind_method(D_METHOD("add_undo_property", "object", "property", "value"), &UndoRedo::add_undo_property); ClassDB::bind_method(D_METHOD("add_undo_property", "object", "property", "value"), &UndoRedo::add_undo_property);
ClassDB::bind_method(D_METHOD("add_do_reference", "object"), &UndoRedo::add_do_reference); ClassDB::bind_method(D_METHOD("add_do_reference", "object"), &UndoRedo::add_do_reference);
ClassDB::bind_method(D_METHOD("add_undo_reference", "object"), &UndoRedo::add_undo_reference); ClassDB::bind_method(D_METHOD("add_undo_reference", "object"), &UndoRedo::add_undo_reference);
ClassDB::bind_method(D_METHOD("clear_history"), &UndoRedo::clear_history); ClassDB::bind_method(D_METHOD("clear_history", "increase_version"), &UndoRedo::clear_history, DEFVAL(true));
ClassDB::bind_method(D_METHOD("get_current_action_name"), &UndoRedo::get_current_action_name); ClassDB::bind_method(D_METHOD("get_current_action_name"), &UndoRedo::get_current_action_name);
ClassDB::bind_method(D_METHOD("get_version"), &UndoRedo::get_version); ClassDB::bind_method(D_METHOD("get_version"), &UndoRedo::get_version);
ClassDB::bind_method(D_METHOD("redo"), &UndoRedo::redo); ClassDB::bind_method(D_METHOD("redo"), &UndoRedo::redo);

2
core/undo_redo.h
View file

@ -112,7 +112,7 @@ public:
bool redo(); bool redo();
bool undo(); bool undo();
String get_current_action_name() const; String get_current_action_name() const;
void clear_history(); void clear_history(bool p_increase_version = true);
uint64_t get_version() const; uint64_t get_version() const;

3
doc/classes/UndoRedo.xml
View file

@ -102,8 +102,11 @@
<method name="clear_history"> <method name="clear_history">
<return type="void"> <return type="void">
</return> </return>
<argument index="0" name="increase_version" type="bool" default="true">
</argument>
<description> <description>
Clear the undo/redo history and associated references. Clear the undo/redo history and associated references.
Passing [code]false[/code] to [code]increase_version[/code] will prevent the version number to be increased from this.
</description> </description>
</method> </method>
<method name="commit_action"> <method name="commit_action">

4
editor/editor_node.cpp
View file

@ -2003,7 +2003,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
if (err != OK) if (err != OK)
ERR_PRINT("Failed to load scene"); ERR_PRINT("Failed to load scene");
editor_data.move_edited_scene_to_index(cur_idx); editor_data.move_edited_scene_to_index(cur_idx);
get_undo_redo()->clear_history(); get_undo_redo()->clear_history(false);
scene_tabs->set_current_tab(cur_idx); scene_tabs->set_current_tab(cur_idx);
} break; } break;
@ -2613,7 +2613,7 @@ void EditorNode::_remove_edited_scene() {
} }
_scene_tab_changed(new_index); _scene_tab_changed(new_index);
editor_data.remove_scene(old_index); editor_data.remove_scene(old_index);
editor_data.get_undo_redo().clear_history(); editor_data.get_undo_redo().clear_history(false);
_update_title(); _update_title();
_update_scene_tabs(); _update_scene_tabs();
} }