noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix undo/redo for adding scene tiles

Browse Source
This commit is contained in:
kobewi
2026-01-04 21:29:39 +01:00
parent 4036e90a43
commit 945b2a4522
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp
+17 -13
View File
@@ -256,11 +256,10 @@ void TileSetScenesCollectionSourceEditor::_scene_file_selected(const String &p_p
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
undo_redo->create_action(TTR("Add a Scene Tile"));
undo_redo->add_do_method(*tile_set_scenes_collection_source, "create_scene_tile", scene, scene_id);
undo_redo->add_do_method(this, "_update_all");
undo_redo->add_undo_method(*tile_set_scenes_collection_source, "remove_scene_tile", scene_id);
undo_redo->add_undo_method(this, "_update_all");
undo_redo->commit_action();
_update_scenes_list();
_update_action_buttons();
_update_tile_inspector();
}
void TileSetScenesCollectionSourceEditor::_source_delete_pressed() {
@@ -271,11 +270,10 @@ void TileSetScenesCollectionSourceEditor::_source_delete_pressed() {
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
undo_redo->create_action(TTR("Remove a Scene Tile"));
undo_redo->add_do_method(*tile_set_scenes_collection_source, "remove_scene_tile", scene_id);
undo_redo->add_do_method(this, "_update_all");
undo_redo->add_undo_method(*tile_set_scenes_collection_source, "create_scene_tile", tile_set_scenes_collection_source->get_scene_tile_scene(scene_id), scene_id);
undo_redo->add_undo_method(this, "_update_all");
undo_redo->commit_action();
_update_scenes_list();
_update_action_buttons();
_update_tile_inspector();
}
void TileSetScenesCollectionSourceEditor::_update_source_inspector() {
@@ -303,6 +301,12 @@ void TileSetScenesCollectionSourceEditor::_update_action_buttons() {
scene_tile_delete_button->set_disabled(selected_indices.is_empty() || read_only);
}
void TileSetScenesCollectionSourceEditor::_update_all() {
_update_scenes_list();
_update_action_buttons();
_update_tile_inspector();
}
void TileSetScenesCollectionSourceEditor::_update_scenes_list() {
if (tile_set_scenes_collection_source.is_null()) {
return;
@@ -449,22 +453,20 @@ void TileSetScenesCollectionSourceEditor::_drop_data_fw(const Point2 &p_point, c
if (p_from == scene_tiles_list) {
// Handle dropping a texture in the list of atlas resources.
Dictionary d = p_data;
Vector<String> files = d["files"];
for (int i = 0; i < files.size(); i++) {
Ref<PackedScene> resource = ResourceLoader::load(files[i]);
const Vector<String> files = d["files"];
for (const String &file : files) {
const Ref<PackedScene> resource = ResourceLoader::load(file);
if (resource.is_valid()) {
int scene_id = tile_set_scenes_collection_source->get_next_scene_tile_id();
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
undo_redo->create_action(TTR("Add a Scene Tile"));
undo_redo->add_do_method(*tile_set_scenes_collection_source, "create_scene_tile", resource, scene_id);
undo_redo->add_do_method(this, "_update_all");
undo_redo->add_undo_method(*tile_set_scenes_collection_source, "remove_scene_tile", scene_id);
undo_redo->add_undo_method(this, "_update_all");
undo_redo->commit_action();
}
}
_update_scenes_list();
_update_action_buttons();
_update_tile_inspector();
}
}
@@ -499,6 +501,8 @@ bool TileSetScenesCollectionSourceEditor::_can_drop_data_fw(const Point2 &p_poin
}
void TileSetScenesCollectionSourceEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_update_all"), &TileSetScenesCollectionSourceEditor::_update_all);
ADD_SIGNAL(MethodInfo("source_id_changed", PropertyInfo(Variant::INT, "source_id")));
}
editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.h
+1
View File
@@ -130,6 +130,7 @@ private:
void _update_tile_inspector();
void _update_scenes_list();
void _update_action_buttons();
void _update_all();
void _drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
bool _can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;