asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #90525 from KoBeWi/color_limbo

Browse source 
Fix folder colors not saving after project.godot is modifed externally
This commit is contained in:
Rémi Verschelde 2024-04-13 11:30:21 +02:00
commit 665a98b5f2
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/filesystem_dock.cpp
View file

@ -3693,6 +3693,10 @@ void FileSystemDock::_feature_profile_changed() {
_update_display_mode(true); _update_display_mode(true);
} }
void FileSystemDock::_project_settings_changed() {
assigned_folder_colors = ProjectSettings::get_singleton()->get_setting("file_customization/folder_colors");
}
void FileSystemDock::set_file_sort(FileSortOption p_file_sort) { void FileSystemDock::set_file_sort(FileSortOption p_file_sort) {
for (int i = 0; i != FILE_SORT_MAX; i++) { for (int i = 0; i != FILE_SORT_MAX; i++) {
tree_button_sort->get_popup()->set_item_checked(i, (i == (int)p_file_sort)); tree_button_sort->get_popup()->set_item_checked(i, (i == (int)p_file_sort));
@ -4122,6 +4126,7 @@ FileSystemDock::FileSystemDock() {
old_display_mode = DISPLAY_MODE_TREE_ONLY; old_display_mode = DISPLAY_MODE_TREE_ONLY;
file_list_display_mode = FILE_LIST_DISPLAY_THUMBNAILS; file_list_display_mode = FILE_LIST_DISPLAY_THUMBNAILS;
ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &FileSystemDock::_project_settings_changed));
add_resource_tooltip_plugin(memnew(EditorTextureTooltipPlugin)); add_resource_tooltip_plugin(memnew(EditorTextureTooltipPlugin));
} }

1
editor/filesystem_dock.h
View file

@ -362,6 +362,7 @@ private:
bool _is_file_type_disabled_by_feature_profile(const StringName &p_class); bool _is_file_type_disabled_by_feature_profile(const StringName &p_class);
void _feature_profile_changed(); void _feature_profile_changed();
void _project_settings_changed();
static Vector<String> _remove_self_included_paths(Vector<String> selected_strings); static Vector<String> _remove_self_included_paths(Vector<String> selected_strings);
void _change_bottom_dock_placement(); void _change_bottom_dock_placement();