mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-22 18:43:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #99898 from MewPurPur/bro-the-order-didnt-change-wdym

Browse source 
Don't create an UndoRedo action if Autoload order doesn't change after Drag & Drop
This commit is contained in:
Rémi Verschelde 2025-01-06 22:47:16 +01:00
commit b63349024a
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
editor/editor_autoload_settings.cpp
View file

@ -715,6 +715,15 @@ void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant &
Dictionary drop_data = p_data;
PackedStringArray autoloads = drop_data["autoloads"];
// Store the initial order of the autoloads for comparison.
Vector<int> initial_orders;
initial_orders.resize(autoload_cache.size());
int idx = 0;
for (const AutoloadInfo &F : autoload_cache) {
initial_orders.write[idx++] = F.order;
}
// Perform the drag-and-drop operation.
Vector<int> orders;
orders.resize(autoload_cache.size());
@ -734,10 +743,14 @@ void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant &
}
}
int i = 0;
idx = 0;
for (const AutoloadInfo &F : autoload_cache) {
orders.write[i++] = F.order;
orders.write[idx++] = F.order;
}
// If the order didn't change, we shouldn't create undo/redo actions.
if (orders == initial_orders) {
return;
}
orders.sort();
@ -746,10 +759,9 @@ void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant &
undo_redo->create_action(TTR("Rearrange Autoloads"));
i = 0;
idx = 0;
for (const AutoloadInfo &F : autoload_cache) {
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set_order", "autoload/" + F.name, orders[i++]);
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set_order", "autoload/" + F.name, orders[idx++]);
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set_order", "autoload/" + F.name, F.order);
}