From c029a03bc34f2f0a67207c453e3bc18b174f496a Mon Sep 17 00:00:00 2001 From: Stijn Hinlopen Date: Sat, 27 Jun 2020 16:29:44 +0200 Subject: [PATCH] Remove directory search results (cherry picked from commit c33707e9b44478f6efaf57a0ca9c8496bcb87695) --- editor/quick_open.cpp | 82 +++++++++++-------------------------------- editor/quick_open.h | 4 +-- 2 files changed, 23 insertions(+), 63 deletions(-) diff --git a/editor/quick_open.cpp b/editor/quick_open.cpp index 33289f448b7..a39c50001c5 100644 --- a/editor/quick_open.cpp +++ b/editor/quick_open.cpp @@ -32,20 +32,17 @@ #include "core/os/keyboard.h" -void EditorQuickOpen::popup_dialog(const StringName &p_base, bool p_enable_multi, bool p_add_dirs, bool p_dontclear) { +void EditorQuickOpen::popup_dialog(const StringName &p_base, bool p_enable_multi, bool p_dontclear) { + base_type = p_base; + search_options->set_select_mode(p_enable_multi ? Tree::SELECT_MULTI : Tree::SELECT_SINGLE); + popup_centered_ratio(0.4); - add_directories = p_add_dirs; - popup_centered_ratio(0.6); if (p_dontclear) search_box->select_all(); else search_box->clear(); - if (p_enable_multi) - search_options->set_select_mode(Tree::SELECT_MULTI); - else - search_options->set_select_mode(Tree::SELECT_SINGLE); + search_box->grab_focus(); - base_type = p_base; _update_search(); } @@ -105,7 +102,6 @@ void EditorQuickOpen::_sbox_input(const Ref &p_ie) { } current->select(0); - } break; } } @@ -129,65 +125,26 @@ float EditorQuickOpen::_path_cmp(String search, String path) const { } void EditorQuickOpen::_parse_fs(EditorFileSystemDirectory *efsd, Vector > > &list) { - - if (!add_directories) { - for (int i = 0; i < efsd->get_subdir_count(); i++) { - - _parse_fs(efsd->get_subdir(i), list); - } + for (int i = 0; i < efsd->get_subdir_count(); i++) { + _parse_fs(efsd->get_subdir(i), list); } String search_text = search_box->get_text(); - if (add_directories) { - String path = efsd->get_path(); - if (!path.ends_with("/")) - path += "/"; - if (path != "res://") { - path = path.substr(6, path.length()); - if (search_text.is_subsequence_ofi(path)) { - Pair > pair; - pair.first = path; - pair.second = get_icon("folder", "FileDialog"); - - if (search_text != String() && list.size() > 0) { - - float this_sim = _path_cmp(search_text, path); - float other_sim = _path_cmp(list[0].first, path); - int pos = 1; - - while (pos < list.size() && this_sim <= other_sim) { - other_sim = _path_cmp(list[pos++].first, path); - } - - pos = this_sim >= other_sim ? pos - 1 : pos; - list.insert(pos, pair); - - } else { - list.push_back(pair); - } - } - } - } for (int i = 0; i < efsd->get_file_count(); i++) { String file = efsd->get_file_path(i); file = file.substr(6, file.length()); - if (ClassDB::is_parent_class(efsd->get_file_type(i), base_type) && (search_text.is_subsequence_ofi(file))) { + StringName file_type = efsd->get_file_type(i); + if (ClassDB::is_parent_class(file_type, base_type) && search_text.is_subsequence_ofi(file)) { Pair > pair; pair.first = file; - pair.second = get_icon((has_icon(efsd->get_file_type(i), ei) ? efsd->get_file_type(i) : ot), ei); + StringName icon_name = search_options->has_icon(file_type, ei) ? file_type : ot; + pair.second = search_options->get_icon(icon_name, ei); list.push_back(pair); } } - - if (add_directories) { - for (int i = 0; i < efsd->get_subdir_count(); i++) { - - _parse_fs(efsd->get_subdir(i), list); - } - } } Vector > > EditorQuickOpen::_sort_fs(Vector > > &list) { @@ -295,21 +252,24 @@ EditorQuickOpen::EditorQuickOpen() { VBoxContainer *vbc = memnew(VBoxContainer); add_child(vbc); + search_box = memnew(LineEdit); - vbc->add_margin_child(TTR("Search:"), search_box); search_box->connect("text_changed", this, "_text_changed"); search_box->connect("gui_input", this, "_sbox_input"); + vbc->add_margin_child(TTR("Search:"), search_box); + search_options = memnew(Tree); - vbc->add_margin_child(TTR("Matches:"), search_options, true); - get_ok()->set_text(TTR("Open")); - get_ok()->set_disabled(true); - register_text_enter(search_box); - set_hide_on_ok(false); search_options->connect("item_activated", this, "_confirmed"); search_options->set_hide_root(true); search_options->set_hide_folding(true); search_options->add_constant_override("draw_guides", 1); + vbc->add_margin_child(TTR("Matches:"), search_options, true); + + get_ok()->set_text(TTR("Open")); + get_ok()->set_disabled(true); + register_text_enter(search_box); + set_hide_on_ok(false); + ei = "EditorIcons"; ot = "Object"; - add_directories = false; } diff --git a/editor/quick_open.h b/editor/quick_open.h index a4eb44c8050..268b0e07ca9 100644 --- a/editor/quick_open.h +++ b/editor/quick_open.h @@ -35,6 +35,7 @@ #include "editor_file_system.h" #include "scene/gui/dialogs.h" #include "scene/gui/tree.h" + class EditorQuickOpen : public ConfirmationDialog { GDCLASS(EditorQuickOpen, ConfirmationDialog); @@ -44,7 +45,6 @@ class EditorQuickOpen : public ConfirmationDialog { StringName base_type; StringName ei; StringName ot; - bool add_directories; void _update_search(); @@ -66,7 +66,7 @@ public: String get_selected() const; Vector get_selected_files() const; - void popup_dialog(const StringName &p_base, bool p_enable_multi = false, bool p_add_dirs = false, bool p_dontclear = false); + void popup_dialog(const StringName &p_base, bool p_enable_multi = false, bool p_dontclear = false); EditorQuickOpen(); };