godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Merge pull request #56325 from pycbouh/editor-resource-picker-needs-type-3.x

Browse Source
This commit is contained in:
Rémi Verschelde
2022-01-07 16:13:46 +01:00
committed by GitHub
parent 4737f563df d9bf3e5e35
commit 01fef99749
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/EditorResourcePicker.xml
View File

@@ -40,7 +40,7 @@
</description> </description>
</method> </method>
<method name="handle_menu_selected" qualifiers="virtual"> <method name="handle_menu_selected" qualifiers="virtual">
<return type="void" /> <return type="bool" />
<argument index="0" name="id" type="int" /> <argument index="0" name="id" type="int" />
<description> <description>
This virtual method can be implemented to handle context menu items not handled by default. See [method set_create_options]. This virtual method can be implemented to handle context menu items not handled by default. See [method set_create_options].

2
editor/editor_resource_picker.cpp
View File

@@ -687,7 +687,7 @@ void EditorResourcePicker::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_editable"), &EditorResourcePicker::is_editable); ClassDB::bind_method(D_METHOD("is_editable"), &EditorResourcePicker::is_editable);
ClassDB::add_virtual_method(get_class_static(), MethodInfo("set_create_options", PropertyInfo(Variant::OBJECT, "menu_node"))); ClassDB::add_virtual_method(get_class_static(), MethodInfo("set_create_options", PropertyInfo(Variant::OBJECT, "menu_node")));
ClassDB::add_virtual_method(get_class_static(), MethodInfo("handle_menu_selected", PropertyInfo(Variant::INT, "id"))); ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::BOOL, "handle_menu_selected", PropertyInfo(Variant::INT, "id")));
ADD_PROPERTY(PropertyInfo(Variant::STRING, "base_type"), "set_base_type", "get_base_type"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "base_type"), "set_base_type", "get_base_type");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "edited_resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource", 0), "set_edited_resource", "get_edited_resource"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "edited_resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource", 0), "set_edited_resource", "get_edited_resource");