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

Merge pull request #68690 from KoBeWi/StringNoName

Browse source 
Change EditorQuickOpen base_type to String
This commit is contained in:
Rémi Verschelde 2022-11-15 16:25:31 +01:00
commit 7b3c1a0a83
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/editor_quick_open.cpp
View file

@ -33,7 +33,7 @@
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
void EditorQuickOpen::popup_dialog(const StringName &p_base, bool p_enable_multi, bool p_dontclear) { void EditorQuickOpen::popup_dialog(const String &p_base, bool p_enable_multi, bool p_dontclear) {
base_type = p_base; base_type = p_base;
allow_multi_select = p_enable_multi; allow_multi_select = p_enable_multi;
search_options->set_select_mode(allow_multi_select ? Tree::SELECT_MULTI : Tree::SELECT_SINGLE); search_options->set_select_mode(allow_multi_select ? Tree::SELECT_MULTI : Tree::SELECT_SINGLE);
@ -56,7 +56,7 @@ void EditorQuickOpen::_build_search_cache(EditorFileSystemDirectory *p_efsd) {
_build_search_cache(p_efsd->get_subdir(i)); _build_search_cache(p_efsd->get_subdir(i));
} }
Vector<String> base_types = String(base_type).split(String(",")); Vector<String> base_types = base_type.split(",");
for (int i = 0; i < p_efsd->get_file_count(); i++) { for (int i = 0; i < p_efsd->get_file_count(); i++) {
String file = p_efsd->get_file_path(i); String file = p_efsd->get_file_path(i);
String engine_type = p_efsd->get_file_type(i); String engine_type = p_efsd->get_file_type(i);
@ -80,7 +80,7 @@ void EditorQuickOpen::_build_search_cache(EditorFileSystemDirectory *p_efsd) {
// Store refs to used icons. // Store refs to used icons.
String ext = file.get_extension(); String ext = file.get_extension();
if (!icons.has(ext)) { if (!icons.has(ext)) {
icons.insert(ext, get_theme_icon((has_theme_icon(actual_type, SNAME("EditorIcons")) ? actual_type : String("Object")), SNAME("EditorIcons"))); icons.insert(ext, get_theme_icon((has_theme_icon(actual_type, SNAME("EditorIcons")) ? actual_type : "Object"), SNAME("EditorIcons")));
} }
// Stop testing base types as soon as we got a match. // Stop testing base types as soon as we got a match.
@ -231,7 +231,7 @@ Vector<String> EditorQuickOpen::get_selected_files() const {
return selected_files; return selected_files;
} }
StringName EditorQuickOpen::get_base_type() const { String EditorQuickOpen::get_base_type() const {
return base_type; return base_type;
} }

6
editor/editor_quick_open.h
View file

@ -41,7 +41,7 @@ class EditorQuickOpen : public ConfirmationDialog {
LineEdit *search_box = nullptr; LineEdit *search_box = nullptr;
Tree *search_options = nullptr; Tree *search_options = nullptr;
StringName base_type; String base_type;
bool allow_multi_select = false; bool allow_multi_select = false;
bool _load_resources = false; // Prohibitively slow for now. bool _load_resources = false; // Prohibitively slow for now.
@ -77,12 +77,12 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
StringName get_base_type() const; String get_base_type() const;
String get_selected() const; String get_selected() const;
Vector<String> get_selected_files() const; Vector<String> get_selected_files() const;
void popup_dialog(const StringName &p_base, bool p_enable_multi = false, bool p_dontclear = false); void popup_dialog(const String &p_base, bool p_enable_multi = false, bool p_dontclear = false);
EditorQuickOpen(); EditorQuickOpen();
}; };