seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make EditorFileDialog only created on demand in EditorResourcePicker

Browse Source
This commit is contained in:
Yuri Sizov
2021-05-25 18:38:19 +03:00
parent 313e1f62bb
commit c8551b0eda
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/EditorSpinSlider.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<class name="EditorSpinSlider" inherits="Range" version="4.0"> <class name="EditorSpinSlider" inherits="Range" version="4.0">
<brief_description> <brief_description>
Godot editor's control for editing numertic values. Godot editor's control for editing numeric values.
</brief_description> </brief_description>
<description> <description>
This [Control] node is used in the editor's Inspector dock to allow editing of numeric values. Can be used with [EditorInspectorPlugin] to recreate the same behavior. This [Control] node is used in the editor's Inspector dock to allow editing of numeric values. Can be used with [EditorInspectorPlugin] to recreate the same behavior.

26
editor/editor_resource_picker.cpp
View File

@ -224,6 +224,13 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
valid_extensions.insert(E->get()); valid_extensions.insert(E->get());
} }
if (!file_dialog) {
file_dialog = memnew(EditorFileDialog);
file_dialog->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
add_child(file_dialog);
file_dialog->connect("file_selected", callable_mp(this, &EditorResourcePicker::_file_selected));
}
file_dialog->clear_filters(); file_dialog->clear_filters();
for (Set<String>::Element *E = valid_extensions.front(); E; E = E->next()) { for (Set<String>::Element *E = valid_extensions.front(); E; E = E->next()) {
file_dialog->add_filter("*." + E->get() + " ; " + E->get().to_upper()); file_dialog->add_filter("*." + E->get() + " ; " + E->get().to_upper());
@ -781,10 +788,11 @@ EditorResourcePicker::EditorResourcePicker() {
assign_button->set_flat(true); assign_button->set_flat(true);
assign_button->set_h_size_flags(SIZE_EXPAND_FILL); assign_button->set_h_size_flags(SIZE_EXPAND_FILL);
assign_button->set_clip_text(true); assign_button->set_clip_text(true);
assign_button->connect("pressed", callable_mp(this, &EditorResourcePicker::_resource_selected));
assign_button->set_drag_forwarding(this); assign_button->set_drag_forwarding(this);
assign_button->connect("draw", callable_mp(this, &EditorResourcePicker::_button_draw));
add_child(assign_button); add_child(assign_button);
assign_button->connect("pressed", callable_mp(this, &EditorResourcePicker::_resource_selected));
assign_button->connect("draw", callable_mp(this, &EditorResourcePicker::_button_draw));
assign_button->connect("gui_input", callable_mp(this, &EditorResourcePicker::_button_input));
preview_rect = memnew(TextureRect); preview_rect = memnew(TextureRect);
preview_rect->set_expand(true); preview_rect->set_expand(true);
@ -793,23 +801,17 @@ EditorResourcePicker::EditorResourcePicker() {
preview_rect->set_offset(SIDE_BOTTOM, -1); preview_rect->set_offset(SIDE_BOTTOM, -1);
preview_rect->set_offset(SIDE_RIGHT, -1); preview_rect->set_offset(SIDE_RIGHT, -1);
assign_button->add_child(preview_rect); assign_button->add_child(preview_rect);
assign_button->connect("gui_input", callable_mp(this, &EditorResourcePicker::_button_input));
edit_menu = memnew(PopupMenu);
add_child(edit_menu);
edit_button = memnew(Button); edit_button = memnew(Button);
edit_button->set_flat(true); edit_button->set_flat(true);
edit_button->set_toggle_mode(true); edit_button->set_toggle_mode(true);
edit_menu->connect("id_pressed", callable_mp(this, &EditorResourcePicker::_edit_menu_cbk));
edit_menu->connect("popup_hide", callable_mp((BaseButton *)edit_button, &BaseButton::set_pressed), varray(false));
edit_button->connect("pressed", callable_mp(this, &EditorResourcePicker::_update_menu)); edit_button->connect("pressed", callable_mp(this, &EditorResourcePicker::_update_menu));
add_child(edit_button); add_child(edit_button);
edit_button->connect("gui_input", callable_mp(this, &EditorResourcePicker::_button_input)); edit_button->connect("gui_input", callable_mp(this, &EditorResourcePicker::_button_input));
edit_menu = memnew(PopupMenu);
file_dialog = memnew(EditorFileDialog); add_child(edit_menu);
file_dialog->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE); edit_menu->connect("id_pressed", callable_mp(this, &EditorResourcePicker::_edit_menu_cbk));
add_child(file_dialog); edit_menu->connect("popup_hide", callable_mp((BaseButton *)edit_button, &BaseButton::set_pressed), varray(false));
file_dialog->connect("file_selected", callable_mp(this, &EditorResourcePicker::_file_selected));
} }
void EditorScriptPicker::set_create_options(Object *p_menu_node) { void EditorScriptPicker::set_create_options(Object *p_menu_node) {

2
editor/editor_resource_picker.h
View File

@ -51,7 +51,7 @@ class EditorResourcePicker : public HBoxContainer {
Button *assign_button; Button *assign_button;
TextureRect *preview_rect; TextureRect *preview_rect;
Button *edit_button; Button *edit_button;
EditorFileDialog *file_dialog; EditorFileDialog *file_dialog = nullptr;
enum MenuOption { enum MenuOption {
OBJ_MENU_LOAD, OBJ_MENU_LOAD,