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

Revert "Fix FileSystem dock won't show any file folders"

Browse Source 
This reverts commit 72856d633a.

Fixes #93022.
This commit is contained in:
Rémi Verschelde
2024-06-11 11:46:35 +02:00
parent 62a056aa56
commit e4fa8543ea
10 changed files with 225 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
editor/filesystem_dock.cpp
View File

@@ -550,8 +550,6 @@ void FileSystemDock::_notification(int p_what) {
case NOTIFICATION_READY: {
EditorFeatureProfileManager::get_singleton()->connect("current_feature_profile_changed", callable_mp(this, &FileSystemDock::_feature_profile_changed));
EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &FileSystemDock::_fs_changed));
EditorFileSystem::get_singleton()->connect("scan_started", callable_mp(this, &FileSystemDock::_scan_started));
EditorFileSystem::get_singleton()->connect("scan_stopped", callable_mp(this, &FileSystemDock::_scan_stopped));
EditorResourcePreview::get_singleton()->connect("preview_invalidated", callable_mp(this, &FileSystemDock::_preview_invalidated));
button_file_list_display_mode->connect(SceneStringName(pressed), callable_mp(this, &FileSystemDock::_toggle_file_display));
@@ -568,7 +566,9 @@ void FileSystemDock::_notification(int p_what) {
_update_display_mode();
if (!EditorFileSystem::get_singleton()->is_scanning()) {
if (EditorFileSystem::get_singleton()->is_scanning()) {
_set_scanning_mode();
} else {
_update_tree(Vector<String>(), true);
}
} break;
@@ -1326,18 +1326,6 @@ void FileSystemDock::_fs_changed() {
set_process(false);
}
void FileSystemDock::_scan_started(bool p_complete_scan) {
if (p_complete_scan) {
_set_scanning_mode();
}
}
void FileSystemDock::_scan_stopped(bool p_complete_scan) {
if (p_complete_scan) {
_fs_changed();
}
}
void FileSystemDock::_set_scanning_mode() {
button_hist_prev->set_disabled(true);
button_hist_next->set_disabled(true);
@@ -2661,6 +2649,7 @@ bool FileSystemDock::_matches_all_search_tokens(const String &p_text) {
}
void FileSystemDock::_rescan() {
_set_scanning_mode();
EditorFileSystem::get_singleton()->scan();
}