diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-20 12:04:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 12:04:47 +0200 |
| commit | 4d9b5852f4d4822278be47de8fa45c5cd596f413 (patch) | |
| tree | 96a484d0bb80a62059e5c466db722d2022daabea /editor/editor_resource_picker.h | |
| parent | 1e93e3fc491e8780722fc2324f2c0c42ea8913df (diff) | |
| parent | 470b94fe22b83fb97bb5132a1e4855cd196c956d (diff) | |
Merge pull request #37228 from rcorre/rcorre/better-load-dialog
Use QuickOpen to load resources in the inspector.
Diffstat (limited to 'editor/editor_resource_picker.h')
| -rw-r--r-- | editor/editor_resource_picker.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h index d77c31f831..d0dad0287b 100644 --- a/editor/editor_resource_picker.h +++ b/editor/editor_resource_picker.h @@ -32,6 +32,7 @@ #define EDITOR_RESOURCE_PICKER_H #include "editor_file_dialog.h" +#include "quick_open.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/popup_menu.h" @@ -54,9 +55,11 @@ class EditorResourcePicker : public HBoxContainer { TextureRect *preview_rect; Button *edit_button; EditorFileDialog *file_dialog = nullptr; + EditorQuickOpen *quick_open = nullptr; enum MenuOption { OBJ_MENU_LOAD, + OBJ_MENU_QUICKLOAD, OBJ_MENU_EDIT, OBJ_MENU_CLEAR, OBJ_MENU_MAKE_UNIQUE, @@ -75,6 +78,7 @@ class EditorResourcePicker : public HBoxContainer { void _update_resource_preview(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, ObjectID p_obj); void _resource_selected(); + void _file_quick_selected(); void _file_selected(const String &p_path); void _update_menu(); |