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

Merge pull request #82806 from Vilcrow/fix-ensure-selected-visible

Browse source 
Fix checking the visibility condition of selected file in the Godot editor's dock
This commit is contained in:
Rémi Verschelde 2023-10-27 11:35:40 +02:00
commit 8919d1c2b5
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editor/filesystem_dock.cpp
View file

@ -733,7 +733,11 @@ void FileSystemDock::_navigate_to_path(const String &p_path, bool p_select_in_fa
_update_tree(get_uncollapsed_paths(), false, p_select_in_favorites, true);
if (display_mode != DISPLAY_MODE_TREE_ONLY) {
_update_file_list(false);
files->get_v_scroll_bar()->set_value(0);
// Reset the scroll for a directory.
if (p_path.ends_with("/")) {
files->get_v_scroll_bar()->set_value(0);
}
}
String file_name = p_path.get_file();
@ -1160,9 +1164,7 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorites) {
String fpath = p_path;
if (fpath.ends_with("/")) {
if (fpath != "res://") {
fpath = fpath.substr(0, fpath.length() - 1);
}
// Ignore a directory.
} else if (fpath != "Favorites") {
if (FileAccess::exists(fpath + ".import")) {
Ref<ConfigFile> config;