Merge pull request #20997 from Gamblify/add_files_to_tree_view

Add a way to disable the split view in the FileSystem dock

editor/editor_node.cpp

@@ -5409,7 +5409,7 @@ EditorNode::EditorNode() {
 	}
 
 	filesystem_dock = memnew(FileSystemDock(this));
-	filesystem_dock->set_display_mode(int(EditorSettings::get_singleton()->get("docks/filesystem/display_mode")));
+	filesystem_dock->set_file_list_display_mode(int(EditorSettings::get_singleton()->get("docks/filesystem/display_mode")));
 
 	if (use_single_dock_column) {
 		dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(filesystem_dock);

editor/editor_settings.cpp

@@ -511,6 +511,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("filesystem/file_dialog/thumbnail_size", 64);
 	hints["filesystem/file_dialog/thumbnail_size"] = PropertyInfo(Variant::INT, "filesystem/file_dialog/thumbnail_size", PROPERTY_HINT_RANGE, "32,128,16");
 
+	_initial_set("docks/filesystem/disable_split", false);
+	_initial_set("docks/filesystem/split_mode_minimum_height", 600);
 	_initial_set("docks/filesystem/display_mode", 0);
 	hints["docks/filesystem/display_mode"] = PropertyInfo(Variant::INT, "docks/filesystem/display_mode", PROPERTY_HINT_ENUM, "Thumbnails,List");
 	_initial_set("docks/filesystem/thumbnail_size", 64);

editor/filesystem_dock.cpp

@@ -139,41 +139,56 @@ void FileSystemDock::_update_tree(bool keep_collapse_state, bool p_uncollapse_ro
 	updating_tree = false;
 }
 
-void FileSystemDock::_notification(int p_what) {
+void FileSystemDock::_update_display_mode() {
 
-	switch (p_what) {
+	bool disable_split = bool(EditorSettings::get_singleton()->get("docks/filesystem/disable_split"));
+	bool compact_mode = get_size().height < int(EditorSettings::get_singleton()->get("docks/filesystem/split_mode_minimum_height"));
+	DisplayMode new_mode;
+	if (disable_split || compact_mode) {
+		new_mode = file_list_view ? DISPLAY_FILE_LIST_ONLY : DISPLAY_TREE_ONLY;
+	} else {
+		new_mode = DISPLAY_SPLIT;
+	}
 
-		case NOTIFICATION_RESIZED: {
+	if (new_mode != display_mode) {
+		switch (new_mode) {
+			case DISPLAY_TREE_ONLY:
+				tree->show();
+				tree->set_v_size_flags(SIZE_EXPAND_FILL);
+				_update_tree(true);
 
-			bool new_mode = get_size().height < get_viewport_rect().size.height / 2;
+				file_list_vb->hide();
+				break;
 
-			if (new_mode != low_height_mode) {
+			case DISPLAY_FILE_LIST_ONLY:
+				tree->hide();
+				button_tree->show();
 
-				low_height_mode = new_mode;
+				file_list_vb->show();
+				_update_files(true);
+				break;
 
-				if (low_height_mode) {
+			case DISPLAY_SPLIT:
+				tree->show();
+				tree->set_v_size_flags(SIZE_EXPAND_FILL);
+				button_tree->hide();
+				tree->ensure_cursor_is_visible();
+				_update_tree(true);
 
-					tree->hide();
-					tree->set_v_size_flags(SIZE_EXPAND_FILL);
-					button_tree->show();
-				} else {
+				file_list_vb->show();
+				_update_files(true);
+				break;
+		}
+		display_mode = new_mode;
+	}
+}
 
-					tree->set_v_size_flags(SIZE_FILL);
-					button_tree->hide();
-					if (!tree->is_visible()) {
-						tree->show();
-						button_favorite->show();
-						_update_tree(true);
-					}
-					tree->ensure_cursor_is_visible();
+void FileSystemDock::_notification(int p_what) {
 
-					if (!file_list_vb->is_visible()) {
-						file_list_vb->show();
-						_update_files(true);
-					}
-				}
-			}
+	switch (p_what) {
 
+		case NOTIFICATION_RESIZED: {
+			_update_display_mode();
 		} break;
 		case NOTIFICATION_ENTER_TREE: {
 
@@ -190,8 +205,8 @@ void FileSystemDock::_notification(int p_what) {
 			//button_instance->set_icon(get_icon("Add", ei));
 			//button_open->set_icon(get_icon("Folder", ei));
 			button_tree->set_icon(get_icon("Filesystem", ei));
-			_update_file_display_toggle_button();
-			button_display_mode->connect("pressed", this, "_change_file_display");
+			_update_file_list_display_mode_button();
+			button_file_list_display_mode->connect("pressed", this, "_change_file_display");
 			//file_options->set_icon( get_icon("Tools","ei"));
 			files->connect("item_activated", this, "_select_file");
 			button_hist_next->connect("pressed", this, "_fw_history");
@@ -208,6 +223,8 @@ void FileSystemDock::_notification(int p_what) {
 			button_tree->connect("pressed", this, "_go_to_tree", varray(), CONNECT_DEFERRED);
 			current_path->connect("text_entered", this, "navigate_to_path");
 
+			_update_display_mode();
+
 			if (EditorFileSystem::get_singleton()->is_scanning()) {
 				_set_scanning_mode();
 			} else {
@@ -241,12 +258,8 @@ void FileSystemDock::_notification(int p_what) {
 
 		} break;
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-
+			// Update icons
 			String ei = "EditorIcons";
-			int new_mode = int(EditorSettings::get_singleton()->get("docks/filesystem/display_mode"));
-
-			//_update_icons
-
 			button_reload->set_icon(get_icon("Reload", ei));
 			button_favorite->set_icon(get_icon("Favorites", ei));
 			button_tree->set_icon(get_icon("Filesystem", ei));
@@ -256,14 +269,18 @@ void FileSystemDock::_notification(int p_what) {
 			search_box->set_right_icon(get_icon("Search", ei));
 			search_box->set_clear_button_enabled(true);
 
-			if (new_mode != display_mode) {
-				set_display_mode(new_mode);
+			// Change size mode
+			int new_file_list_mode = int(EditorSettings::get_singleton()->get("docks/filesystem/display_mode"));
+			if (new_file_list_mode != file_list_display_mode) {
+				set_file_list_display_mode(new_file_list_mode);
 			} else {
-				_update_file_display_toggle_button();
+				_update_file_list_display_mode_button();
 				_update_files(true);
 			}
 
-			_update_tree(true);
+			// Change full tree mode
+			_update_display_mode();
+
 		} break;
 	}
 }
@@ -289,7 +306,7 @@ void FileSystemDock::_dir_selected() {
 	current_path->set_text(path);
 	_push_to_history();
 
-	if (!low_height_mode) {
+	if (display_mode == DISPLAY_SPLIT) {
 		_update_files(false);
 	}
 }
@@ -360,7 +377,7 @@ void FileSystemDock::navigate_to_path(const String &p_path) {
 	current_path->set_text(path);
 	_push_to_history();
 
-	if (!low_height_mode) {
+	if (display_mode == DISPLAY_SPLIT) {
 		_update_tree(true);
 		_update_files(false);
 	} else {
@@ -390,24 +407,24 @@ void FileSystemDock::_thumbnail_done(const String &p_path, const Ref<Texture> &p
 	}
 }
 
-void FileSystemDock::_update_file_display_toggle_button() {
+void FileSystemDock::_update_file_list_display_mode_button() {
 
-	if (button_display_mode->is_pressed()) {
-		display_mode = DISPLAY_LIST;
-		button_display_mode->set_icon(get_icon("FileThumbnail", "EditorIcons"));
-		button_display_mode->set_tooltip(TTR("View items as a grid of thumbnails."));
+	if (button_file_list_display_mode->is_pressed()) {
+		file_list_display_mode = FILE_LIST_DISPLAY_LIST;
+		button_file_list_display_mode->set_icon(get_icon("FileThumbnail", "EditorIcons"));
+		button_file_list_display_mode->set_tooltip(TTR("View items as a grid of thumbnails."));
 	} else {
-		display_mode = DISPLAY_THUMBNAILS;
-		button_display_mode->set_icon(get_icon("FileList", "EditorIcons"));
-		button_display_mode->set_tooltip(TTR("View items as a list."));
+		file_list_display_mode = FILE_LIST_DISPLAY_THUMBNAILS;
+		button_file_list_display_mode->set_icon(get_icon("FileList", "EditorIcons"));
+		button_file_list_display_mode->set_tooltip(TTR("View items as a list."));
 	}
 }
 
 void FileSystemDock::_change_file_display() {
 
-	_update_file_display_toggle_button();
+	_update_file_list_display_mode_button();
 
-	EditorSettings::get_singleton()->set("docks/filesystem/display_mode", display_mode);
+	EditorSettings::get_singleton()->set("docks/filesystem/display_mode", file_list_display_mode);
 
 	_update_files(true);
 }
@@ -472,8 +489,8 @@ void FileSystemDock::_update_files(bool p_keep_selection) {
 
 	bool always_show_folders = EditorSettings::get_singleton()->get("docks/filesystem/always_show_folders");
 
-	bool use_thumbnails = (display_mode == DISPLAY_THUMBNAILS);
-	bool use_folders = search_box->get_text().length() == 0 && (low_height_mode || always_show_folders);
+	bool use_thumbnails = (file_list_display_mode == FILE_LIST_DISPLAY_THUMBNAILS);
+	bool use_folders = search_box->get_text().length() == 0 && ((display_mode == DISPLAY_FILE_LIST_ONLY || display_mode == DISPLAY_TREE_ONLY) || always_show_folders);
 
 	if (use_thumbnails) {
 
@@ -617,24 +634,28 @@ void FileSystemDock::_select_file(int p_idx) {
 	}
 }
 
-void FileSystemDock::_go_to_tree() {
+void FileSystemDock::_go_to_file_list() {
 
-	if (low_height_mode) {
-		tree->show();
-		button_favorite->show();
-		file_list_vb->hide();
+	if (display_mode == DISPLAY_TREE_ONLY) {
+		file_list_view = true;
+		_update_display_mode();
+	} else {
+		bool collapsed = tree->get_selected()->is_collapsed();
+		tree->get_selected()->set_collapsed(!collapsed);
+		_update_files(false);
 	}
+}
+void FileSystemDock::_go_to_tree() {
 
-	_update_tree(true);
+	file_list_view = false;
 	tree->grab_focus();
+	_update_display_mode();
 	tree->ensure_cursor_is_visible();
-	//button_open->hide();
-	//file_options->hide();
 }
 
 void FileSystemDock::_preview_invalidated(const String &p_path) {
 
-	if (display_mode == DISPLAY_THUMBNAILS && p_path.get_base_dir() == path && search_box->get_text() == String() && file_list_vb->is_visible_in_tree()) {
+	if (file_list_display_mode == FILE_LIST_DISPLAY_THUMBNAILS && p_path.get_base_dir() == path && search_box->get_text() == String() && file_list_vb->is_visible_in_tree()) {
 
 		for (int i = 0; i < files->get_item_count(); i++) {
 
@@ -1413,24 +1434,6 @@ void FileSystemDock::_resource_created() const {
 	editor->save_resource_as(current_res, path);
 }
 
-void FileSystemDock::_go_to_file_list() {
-
-	if (low_height_mode) {
-		tree->hide();
-		file_list_vb->show();
-		button_favorite->hide();
-	} else {
-		bool collapsed = tree->get_selected()->is_collapsed();
-		tree->get_selected()->set_collapsed(!collapsed);
-	}
-
-	//file_options->show();
-
-	_update_files(false);
-
-	//emit_signal("open",path);
-}
-
 void FileSystemDock::_dir_rmb_pressed(const Vector2 &p_pos) {
 	folder_options->clear();
 	folder_options->set_size(Size2(1, 1));
@@ -1474,7 +1477,7 @@ void FileSystemDock::fix_dependencies(const String &p_for_file) {
 
 void FileSystemDock::focus_on_filter() {
 
-	if (low_height_mode && tree->is_visible()) {
+	if (display_mode == DISPLAY_FILE_LIST_ONLY && tree->is_visible()) {
 		// Tree mode, switch to files list with search box
 		tree->hide();
 		file_list_vb->show();
@@ -1484,12 +1487,12 @@ void FileSystemDock::focus_on_filter() {
 	search_box->grab_focus();
 }
 
-void FileSystemDock::set_display_mode(int p_mode) {
+void FileSystemDock::set_file_list_display_mode(int p_mode) {
 
-	if (p_mode == display_mode)
+	if (p_mode == file_list_display_mode)
 		return;
 
-	button_display_mode->set_pressed(p_mode == DISPLAY_LIST);
+	button_file_list_display_mode->set_pressed(p_mode == FILE_LIST_DISPLAY_LIST);
 	_change_file_display();
 }
 
@@ -2030,9 +2033,9 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 	search_box->connect("text_changed", this, "_search_changed");
 	path_hb->add_child(search_box);
 
-	button_display_mode = memnew(ToolButton);
-	button_display_mode->set_toggle_mode(true);
-	path_hb->add_child(button_display_mode);
+	button_file_list_display_mode = memnew(ToolButton);
+	button_file_list_display_mode->set_toggle_mode(true);
+	path_hb->add_child(button_file_list_display_mode);
 
 	files = memnew(ItemList);
 	files->set_v_size_flags(SIZE_EXPAND_FILL);
@@ -2128,8 +2131,8 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 	history_max_size = 20;
 	history.push_back("res://");
 
-	low_height_mode = false;
-	display_mode = DISPLAY_THUMBNAILS;
+	display_mode = DISPLAY_SPLIT;
+	file_list_display_mode = FILE_LIST_DISPLAY_THUMBNAILS;
 }
 
 FileSystemDock::~FileSystemDock() {

editor/filesystem_dock.h

@@ -60,12 +60,18 @@ class FileSystemDock : public VBoxContainer {
 	GDCLASS(FileSystemDock, VBoxContainer);
 
 public:
-	enum DisplayMode {
-		DISPLAY_THUMBNAILS,
-		DISPLAY_LIST
+	enum FileListDisplayMode {
+		FILE_LIST_DISPLAY_THUMBNAILS,
+		FILE_LIST_DISPLAY_LIST
 	};
 
 private:
+	enum DisplayMode {
+		DISPLAY_TREE_ONLY,
+		DISPLAY_FILE_LIST_ONLY,
+		DISPLAY_SPLIT,
+	};
+
 	enum FileMenu {
 		FILE_OPEN,
 		FILE_INSTANCE,
@@ -106,7 +112,7 @@ private:
 	Button *button_reload;
 	Button *button_favorite;
 	Button *button_tree;
-	Button *button_display_mode;
+	Button *button_file_list_display_mode;
 	Button *button_hist_next;
 	Button *button_hist_prev;
 	Button *button_show;
@@ -115,8 +121,9 @@ private:
 	TextureRect *search_icon;
 	HBoxContainer *path_hb;
 
-	bool low_height_mode;
+	FileListDisplayMode file_list_display_mode;
 	DisplayMode display_mode;
+	bool file_list_view;
 
 	PopupMenu *file_options;
 	PopupMenu *folder_options;
@@ -172,7 +179,7 @@ private:
 	void _files_gui_input(Ref<InputEvent> p_event);
 
 	void _update_files(bool p_keep_selection);
-	void _update_file_display_toggle_button();
+	void _update_file_list_display_mode_button();
 	void _change_file_display();
 	void _fs_changed();
 
@@ -245,6 +252,8 @@ private:
 	void _preview_invalidated(const String &p_path);
 	void _thumbnail_done(const String &p_path, const Ref<Texture> &p_preview, const Variant &p_udata);
 
+	void _update_display_mode();
+
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
@@ -258,7 +267,7 @@ public:
 
 	void fix_dependencies(const String &p_for_file);
 
-	void set_display_mode(int p_mode);
+	void set_file_list_display_mode(int p_mode);
 
 	int get_split_offset() { return split_box->get_split_offset(); }
 	void set_split_offset(int p_offset) { split_box->set_split_offset(p_offset); }