Merge pull request godotengine#100419 from KoBeWi/times_before_search_were_better

akien-mga · akien-mga · commit 7bbdcc802bbd · 2025-01-07T23:17:18.000+01:00
Fix folders uncollapsed after restart with filter
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
@@ -3972,7 +3972,7 @@ void FileSystemDock::save_layout_to_config(Ref<ConfigFile> p_layout, const Strin
 	PackedStringArray selected_files = get_selected_paths();
 	p_layout->set_value(p_section, "dock_filesystem_selected_paths", selected_files);
 	Vector<String> uncollapsed_paths = get_uncollapsed_paths();
-	p_layout->set_value(p_section, "dock_filesystem_uncollapsed_paths", uncollapsed_paths);
+	p_layout->set_value(p_section, "dock_filesystem_uncollapsed_paths", searched_tokens.is_empty() ? uncollapsed_paths : uncollapsed_paths_before_search);
 }
 
 void FileSystemDock::load_layout_from_config(Ref<ConfigFile> p_layout, const String &p_section) {

Original file line number	Diff line number	Diff line change
`@@ -3972,7 +3972,7 @@ void FileSystemDock::save_layout_to_config(Ref<ConfigFile> p_layout, const Strin`
`3972`	`3972`	`PackedStringArray selected_files = get_selected_paths();`
`3973`	`3973`	`p_layout->set_value(p_section, "dock_filesystem_selected_paths", selected_files);`
`3974`	`3974`	`Vector<String> uncollapsed_paths = get_uncollapsed_paths();`
`3975`		`- p_layout->set_value(p_section, "dock_filesystem_uncollapsed_paths", uncollapsed_paths);`
	`3975`	`+ p_layout->set_value(p_section, "dock_filesystem_uncollapsed_paths", searched_tokens.is_empty() ? uncollapsed_paths : uncollapsed_paths_before_search);`
`3976`	`3976`	`}`
`3977`	`3977`
`3978`	`3978`	`void FileSystemDock::load_layout_from_config(Ref<ConfigFile> p_layout, const String &p_section) {`