Skip to content

Commit cc452f9

Browse files
committed
Merge pull request #104490 from arkology/The-Return-of-the-QuickOpen-Button
`EditorResourcePicker`: Add `Quick Load` button
2 parents a5e87dd + 6adcb20 commit cc452f9

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

editor/editor_resource_picker.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ void EditorResourcePicker::_update_resource() {
8888
}
8989

9090
assign_button->set_disabled(!editable && edited_resource.is_null());
91+
quick_load_button->set_visible(editable && edited_resource.is_null());
9192
}
9293

9394
void EditorResourcePicker::_update_resource_preview(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, ObjectID p_obj) {
@@ -863,6 +864,7 @@ void EditorResourcePicker::_notification(int p_what) {
863864
edit_menu->add_theme_constant_override("icon_max_width", icon_width);
864865
}
865866

867+
quick_load_button->set_button_icon(get_editor_theme_icon(SNAME("Load")));
866868
edit_button->set_button_icon(get_theme_icon(SNAME("select_arrow"), SNAME("Tree")));
867869
} break;
868870

@@ -1004,6 +1006,7 @@ void EditorResourcePicker::set_resource_owner(Object *p_object) {
10041006
void EditorResourcePicker::set_editable(bool p_editable) {
10051007
editable = p_editable;
10061008
assign_button->set_disabled(!editable && edited_resource.is_null());
1009+
quick_load_button->set_visible(editable && edited_resource.is_null());
10071010
edit_button->set_visible(editable);
10081011
}
10091012

@@ -1128,6 +1131,11 @@ EditorResourcePicker::EditorResourcePicker(bool p_hide_assign_button_controls) {
11281131
assign_button->add_child(preview_rect);
11291132
}
11301133

1134+
quick_load_button = memnew(Button);
1135+
quick_load_button->set_tooltip_text(TTRC("Quick Load"));
1136+
add_child(quick_load_button);
1137+
quick_load_button->connect(SceneStringName(pressed), callable_mp(this, &EditorResourcePicker::_edit_menu_cbk).bind(OBJ_MENU_QUICKLOAD));
1138+
11311139
edit_button = memnew(Button);
11321140
edit_button->set_flat(false);
11331141
edit_button->set_toggle_mode(true);

editor/editor_resource_picker.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ class EditorResourcePicker : public HBoxContainer {
5656
Button *assign_button = nullptr;
5757
TextureRect *preview_rect = nullptr;
5858
Button *edit_button = nullptr;
59+
Button *quick_load_button = nullptr;
5960
EditorFileDialog *file_dialog = nullptr;
6061

6162
ConfirmationDialog *duplicate_resources_dialog = nullptr;

0 commit comments

Comments
 (0)