Merge pull request #78914 from KoBeWi/lazy_drop

Fix dropping files from res:// to res://
This commit is contained in:
Rémi Verschelde 2023-07-07 08:30:06 +02:00
commit 64d451daac
No known key found for this signature in database
GPG Key ID: C3336907360768E1

View File

@ -2617,8 +2617,10 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data,
if (!to_dir.is_empty()) {
Vector<String> fnames = drag_data["files"];
to_move.clear();
String target_dir = to_dir == "res://" ? to_dir : to_dir.trim_suffix("/");
for (int i = 0; i < fnames.size(); i++) {
if (fnames[i].trim_suffix("/").get_base_dir() != to_dir.trim_suffix("/")) {
if (fnames[i].trim_suffix("/").get_base_dir() != target_dir) {
to_move.push_back(FileOrFolder(fnames[i], !fnames[i].ends_with("/")));
}
}